pulled in changes from https://code.google.com/p/opendatakit/issues/detail?id=814 by chris
pulled in changes from https://code.google.com/p/opendatakit/issues/detail?id=814 by chris

XLSForm/pyxform,XLSForm/pyxform,dorey/pyxform