Merge pull request #803 from ohmage/master

merge in db setup changes
Merge pull request #836 from stevenolen/master

catch additional exception, closes #831
Merge pull request #837 from ohmage/ohmage-2.16

merge recent 2.16 updates to master