Add .gemrc
Merge branch 'master' of github.com:bitwalker/dotfiles

* 'master' of github.com:bitwalker/dotfiles:
  Fix up install script for osx
Fix merge conflict
Add vim configuration
Update vim configuration