Add supertab
Merge branch 'master' of github.com:mattjbray/vim-config

Conflicts:
	.gitmodules