more descriptive test failure
reduce scope of try
remove couch uppgrade step in travis build
Merge pull request #98 from dimagi/misc

misc minor changes - see commits