finishing name change
new map
Merge branch 'gh-pages' of https://github.com/lshort/emacs-init into gh-pages