commented out all old instances of db which used shelve and not mysql
Merge branches 'master' and 'djk-setup-db'