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.
Added Green Shirted Bouncers to main page.
Merge branch 'alex' into merch
Set up admin vol list.
Set up admin vol list.
Merge branch 'alex' into merch
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.
Merged in Alex branch again.  This has the most recent commits to the master branch too (so.. this should be easy enough to merge back into master)