Disallow conditions on messages.
Merge branch 'ohmage-2.16' of github.com:cens/ohmageServer