use new features of emacs 24.4
Merge branch 'master' of github.com:balle/emacs