Moving base code into new git repo, Heroku template messed up orig git history