bookmarks added
Merge branch 'master' of git.olivierdelort.net:colmaris/emacs
nginx-mode installed and activated