Added some useful git functions to aliases file.
Merge branch 'master' into osx
Improved Git logging, clear-history for Tmux
Merge branch 'master' into osx