small changes
Merge branch 'v2' of github.com:esirola/emacs-starter-kit into v2