New aliases, packages, and vimrc options
Merge branch 'master' of https://github.com/rjn945/dotfiles

Conflicts:
	vim/bundles.vim
	vim/vimrc