potential fix for stuck sessions in cloudcare + cleanup

commit by commit. only functional change is in https://github.com/dimagi/touchforms/commit/eac713e088ffa593c2de786a13de3a07a65068cd

http://manage.dimagi.com/default.asp?115663