Jon Update, git from now on, hopefully

Lots of things to bring git up to date Oct 3, 2013