more plugins
added some bundles
added a vim theme
Merge branch 'master' into imag

Conflicts:
	vimrc