Minor changes/update.
Merge branch 'master' of http://github.com/bjacquet/dotemacs