Added vividchalk
Merge branch 'master' of https://github.com/wmotti/vimrc

Conflicts:
	vimrc