modified some paths and changed some plugins
Merge branch 'master' of github.com:dmaugeri/etc

Conflicts:
	vimrc