Merge branch 'master' of github.com:doenietzomoeilijk/dotvim

* 'master' of github.com:doenietzomoeilijk/dotvim:
  Puppet ft
  Different CtrlP if we're not in a GIT repo.
  Added Puppet support
JShint fix, ctrlp-caching, tmux fixing