Changed vimrc for linux.
I hope this works....
Merge branch 'master' of https://github.com/jmhammond/dotvim

Conflicts:
	vimrc