Updates
Vundle auto-install
Merge branch 'master' of https://github.com/mrichman/dotfiles

Conflicts:
mac/.bash_profile
Set font
Fixed merge conflict