some updates
Merge branch 'master' of github.com:honnix/dot.emacs