Modified readme and gitignore
Merge branch 'master' of https://github.com/martibosch/emacs

conflict README