Updated vimrc
Merge branch 'master' of github.com:joelkuiper/dotfiles

* 'master' of github.com:joelkuiper/dotfiles:
  Disable auto-update in zshrc
  More clojure specific emacs config
  Add emacs dotfile
  Added initialization of submodules
Some emacs tweaking