emacs: mac scroll tweaks
Merge branch 'master' of github.com:smoofra/config

Conflicts:
	init.el