Remove some infrequently used git aliases
Add git reset zsh alias
Cosmetic changes to makefile
Aliases for running make from root of git repo