added mercurialish aliases to gitconfig
updated vim bumdles
added Monokai
Merge branch 'master' of github.com:hoodie/dotfiles

Conflicts:
	vim/colors/Monokai.vim