smaller emacs font at work
Fix caps-lock stuff on windows. Grammar.
Merge branch 'master' of github.com:danbek/setup

Conflicts:
	dot-emacs.d/init.el