Changes to settings file, as per https://github.com/hasgeek/hgapp/commit/d76970277d9defb0ecb42730335ed780235a3199
Changes to views/login.py as per https://github.com/hasgeek/hgapp/commit/6dbfceefd44180939e3709a80af66e252e4d5ad0
Using coaster.db as per https://github.com/hasgeek/hgapp/commit/f04b21ebed309ffb97d5ea90199382fe079d8763
Correction of mistake that most likely creeped in due to incorrect git merging.
Merge branch 'master' into develop