A large commit to bring inline git with the dev box