Fixing a bug in .gitmodules.
Add new plugins.
Merge branch 'master' of github.com:elkorn/dotfiles

Conflicts:
	.gitmodules