Bug fix. Remove advice and replace it with a function.
Merge branch 'master' of github.com:larstvei/dot-emacs