Add kill timeout to upstart config.
Remove superfluous entry from JSON config.
Separate web and DB deploys.
Fix asynchronous table creation migration
Updates to default config
Tweak update-blocks.js