docs
remove some unused aliases
Add git-template dir
Tweak git merge gemfilelock
Setup git rebase autosquash
Tweak PATH for npm