Revert "catch additional exception, closes #831"
fixes #839
read activation function from preferences table. fixes #847
better handle activation function for backwards compatability. #847
make sql init script idempotent
fixes some issues with the UserServices commit
Merge pull request #848 from stevenolen/ohmage-2.16

2.16 bug fixes
Merge pull request #849 from ohmage/ohmage-2.16

Ohmage 2.16