Enable right margin
Merge branch 'master' of github.com:greatghoul/vimrc

Conflicts:
	.vimrc