Added db type
Merge branch 'master' of github.com:jonstjohn/air-canary-web