removed scrollbars, changed colorscheme
Merge branch 'master' of github.com:perungrad/vim-config

Conflicts:
	vimrc