initial work
Merge branch 'master' into knex-upgrade
Readded triggers, using github version of knex, cleaned up
knex upgrade