Fix load-path for machines.el
Merge branch 'master' into dark