Add some new bundles and try to make the rakefile work under linux
Merge branch 'master' of https://github.com/neurobashing/maximum-awesome

Conflicts:
	vimrc.bundles.local