vimrc cleanup, scrollColor plugin, gruvbox colorscheme
Merge branch 'master' of github.com:grahamboree/my-vim-setup

Conflicts:
	.vimrc