Update colorscheme etc
Merge branch 'master' of github.com:ts310/dotfiles

Conflicts:
	vimrc