Merge pull request #30 from modilabs/master

Syncing with modilabs
Sanitizing nbsp spaces
Merge pull request #31 from UW-ICTD/develop

Syncing with modilabs and fixing character code issue
Merge branch 'master' into uw-ictd-nbsp
Merge pull request #86 from modilabs/uw-ictd-nbsp

UW-ICTD/pyxform merge
closes #83