majorly cleaned and improved vimrc
autocomplpop plugin
Merge branch 'master' into work

Conflicts:
	vimrc