further changes to .vimrc --putting back old options
Added some plugins etc
Merge branch 'master' of https://github.com/DesertLynx/.vim

Conflicts:
	.netrwhist
	.vimrc
	UltiSnips/php.snippets