Bring in some changes from zotonic
Ignore emacs files