Tidy build script

Signed-off-by: Nicholas Jackson <nic@thatlondon.com>
Merge branch 'master' of https://github.com/nicholasjackson/angrymonkey

Signed-off-by: Nicholas Jackson <nic@thatlondon.com>

Conflicts:
	co.yat.ios.container/build.xml
Implemented Android calabash testing

Signed-off-by: Nicholas Jackson <nic@thatlondon.com>