slate and colorcolumn
Merge branch 'master' of github.com:vladh/dotfiles

Conflicts:
	.vimrc