Merge branch 'master' of git://github.com/j4ckofalltrades/dotvim

Conflicts:
	vimrc
Merge branch 'master' of git://github.com/j4ckofalltrades/dotvim