reordered
Merge branch 'master' of github.com:ultrahertz/dotemacs