Made some minor changes to local-settings.el
Bringing in changes from aphrodite.

Merge branch 'master' of github.com:macnod/elisp