ColorColumn changed from red to black
GUI font size decreased.
Mapping jj in insert mode to <Esc>
Merge branch 'master' of ssh://github.com/exhuma/vimfiles

Conflicts:
	.vimrc