Added some useful config from thoughtbot/dotfiles