Fix rubygems/homebrew conflicts
Merge branch 'master' of https://github.com/tmandry/dotfiles
Add two shortcuts: be (bundle exec) and gcaa (git commit -a --amend)