Merge pull request #96 from kobotoolbox/quickfixes

Quickfixes
The other enketoIframe bug