Update upstream plugins
Merge branch 'master' into Ubuntu
Merge branch 'master' of https://github.com/smokd/vimrc

Conflicts:
	sources_non_forked/vim-colorschemes