Don't always rebase
Added grouper aliases
Merge branch 'master' of https://github.com/nottombrown/dotfiles