Tidied up alias'
Merge branch 'master' of https://github.com/philipgloyne/dot-files