removed vim multiple cursors plugin
switched snipmate to my own fork
updated snipmate_for_django
Merge branch 'master' of https://github.com/kamykaze/dotfiles

Conflicts:
	_vimrc
Merge branch 'master' of https://github.com/kamykaze/dotfiles
tweaked macvim's settings to use new font compatible with powerline