some db stuff
Merge branch 'jade' of https://github.com/psybuzz/goalkeeper into jade