macmini branch first commit
init.el again!
Merge branch 'master' into macmini
mess 1