Add terminal stuff to vimrc
Merge branch 'master' of github.com:datamadsen/.vim

Conflicts:
	vimrc
New modules
Merge branch 'master' of github.com:datamadsen/.vim

Conflicts:
	.gitmodules