embering
Merge branch 'master' of github.com:sbl/dotfiles

Conflicts:
home/.vimrc
Merge branch 'master' of github.com:sbl/dotfiles