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.