Tweaks
Merge branch 'master' of github.com:macnod/elisp
Merged changes from Aphrodite.
Removed references to js2-mode because js2-mode installed via apt-get