Add `:q` alias for `exit`
Remove rspec bindings for Vim, add Align binding
Add alias for vagrant
Merge branch 'master' of github.com:jgillman/dotfiles

Conflicts:
	vim/vimrc.symlink