Changed emacs -nw to vim
Merge branch 'master' of github.com:kushalj/osx_dotfiles

Conflicts:
	.bashrc