Aliases for git, MacVim and define Heroku PATH
Aliases to restore the last version of a deleted file & assume a file as forever unchanged
Merge