WTF is git doing?  I think this is the development merge I've been
trying to get to work for the last 30 mins...