minor config changes
Merge branch 'master' of github.com:flooose/_emacs