moved to knexjs for query builder
cleanup
Merge branch 'master' into db-postgres