Updated vimrc
Merge branch 'master' of git://github.com/fjellyman/dotvim

Conflicts:
	vimrc