adding scroll offset to vimrc
automatically load ~/.vimrc.local if it exists
using jeff@classy.co instead of jeff@iamjeffmarshall.ca in gitconfig
resolving conflict in vimrc.local