Updated mappings and options.
Merge branch 'master' into develop

* master:
  Updated vundle.
  Updated vim setup.
Magic.
Merge branch 'develop'

* develop:
  Magic.
  Updated mappings and options.