Made setup.sh initialize submodules
Minor vimrc changes
Merge branch 'master' of https://github.com/12qu/dotvim

Conflicts:
	setup.sh