Add emacs.org, nosql.org and modify puppet.org