Cleaning up my terrible abuse of git