Updated my Vim configuration.
Merge branch 'develop'

* develop:
  Updated my Vim configuration.

Conflicts:
	home/.vimrc