Merge pull request #51 from dimagi/jenkins

attempt to fix 2.6 jenkins build
cleanup
undo silly fix
actual fix (i hope)