in the throes of understanding git. this gets us back to the classic, simple, master branch only checkins and pulls.
that should work for our master branch, and the development branch can get this really right first before we get any more crud in the master.