fix minor bugs
Merge branch 'master' of github.com:jschaf/dotemacs

Conflicts:
	autoloads.el