emacs - commented out nginx-mode as it is not retrievable from marmalade.
emacs - commented out nginx-mode as it is not retrievable from marmalade.
Merge from sibling 'master' into 'personal'.