Merge pull request #54 from yaronyg/master

Fix some minor android stuff and commented out some tests
Merge pull request #55 from yaronyg/master

Undo the gradle multi-module refactor
This file accidentally got checked in
This update got lost in the big revert
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'upstream/master'