Change scrolloff
Merge remote-tracking branch 'gh/master'

Conflicts:
	dotfiles/vimrc
Merge branch 'master' into linny