Merge pull request #1317 from daniviga/fix-schema-script

Various small fixes for oq_create_db script
An import ordering issue was breaking Jenkins
More work on the DJANGO_SETTINGS_MODULE issue
Merge pull request #1318 from gem/fix-import

An import ordering issue is breaking Jenkins