hg prompt
syntastic replaces (nearly) all old python plugins
updated a few autocmds & maps
Merge branch 'master' of github.com:jimr/dotfiles

Conflicts:
	.vim/jimr/autocmd.vim
	.vimrc