Moar vundle and updated base config.
Merge branch 'master' into develop

* master:
  Moar vundle and updated base config.