Minor changes.
Merge branch 'master' of github.com:xwl/xwl-emacs-config

Conflicts:
	scripts/emacs.sh
Merge branch 'master' of github.com:xwl/xwl-emacs-config