Merge pull request #160 from modilabs/cleanup

Cleanup
turn off http redirect
Revert "turn off http redirect"

This reverts commit 47e421f834574fdee45c099da28290d8ae53601c.
Merge branch 'master' of https://github.com/MartijnR/enketo
paywall preparation
Merge pull request #161 from modilabs/master

file upload fixes + cleanup
Merge pull request #487 from MartijnR/master

api wall prep