Clean up some useless functions add some nice maps
Merge branch 'master' of github.com:sean-kenny/dotvim

Conflicts:
	vimrc