Added mercurial pull/update to make_vim script
Merge branch 'master' of https://github.com/bnhymn/dotfiles

Conflicts:
	bin/make_vim.sh