Merge; also move moderators from master/

diff --cc .gitignore
index 4da94c140e103b5627112d0527720b565c7e926e,a3b3b0688d0964aa00b96ac4e071df81382b5c73..c3e4d59cb2565dd7ec32c570dba3f38c251e435b
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -12,9 -12,4 +12,11 @@@
  /xlog/log/*/event.log
  /xlog/log/*/event.log.[0-9]
  /xlog/log/*/event.log.[0-9].gz
- /settings
 -/master/moderators
 +/crontab.part
 +/stump/etc/added-headers
 +/stump/etc/added-footer
 +/stump/etc/added-footer.new
 +/stump/etc/approval.key.txt
++
++/settings
++/moderators