Ben Gamari authored Jul 09, 2015 and Ben Gamari committed Jul 10, 2015

These are fairly small changes. I'm just going to recenter these and
then focus on identifying the reason for the drift on master