Oops.
Merge branch 'master' into develop

* master:
  Moar vundle and updated base config.
Moar updates.
Make it so.
No more vim-autoformat.
Dark and light colors.
Dark and gray.
Updated airline.
Airline pretty off by default.
Merge branch 'develop'

* develop:
  Airline pretty off by default.
  Updated airline.
  Dark and gray.
  Dark and light colors.
  No more vim-autoformat.
  Make it so.
  Moar updates.
  Oops.