cherry-pick alias and a better log alias
trailing whitespace is evil
Merge branch 'master' of github.com:michaelkitson/dotfiles