update for emacs24.
Merge branch 'master' of github.com:valda/dotfiles