Moved mercurial configuration in here
Updated vim
Merge branch 'master' of github.com:sfowler/dot-config

* 'master' of github.com:sfowler/dot-config:
  Updated vim subrepo