cherry: a few config changes

Conflicts:
	.vim/.vimrc
M-d for switching in xmonad
stuff
Updates!
vim updates
Misc updates

Conflicts:
	.gitconfig
	.zshrc
Updates!
merge master
merge?
Merge branch 'master' into osx

Conflicts:
	.zshrc
remove pathogen
remove .gitmodules
Add neobundle
disable default neosnippet snippets
Merge branch 'master' into osx