Disabled comments on 2012 site.
Added some tables
Manually merged with backup script from branch merch
Made it slightly easier to run propel-gen on both hosts.  Will still need to manually change things though.
Got backup to work on pontus, will need tweaks to work on khea again.
Fixed some HUGE bugs preventing people from logging into the site, all because Pontus doesn't accept the <?= syntax
Pulled in stuff from Pontus.  The stuff from build.properties won't work on khea
Added local propel-gen to work accross different servers.
Added local propel-gen to work accross different servers.
Modified backup scripts, ideally they'll now work on both khea and pontus.