Fix some things
Add git integration using gm_git