Slight modifications due to opam's update
Merge branch 'master' of https://github.com/theolaurent/.emacs.d