Minor tweaks.
Merge branch 'master' of https://github.com/arkottke/dotfiles
Fixed typo
Updated submodules.
Merge branch 'master' of https://github.com/arkottke/dotfiles

Conflicts:
	vim/vimrc