cleanup
My merge branch 'master' of https://github.com/calabash-driver/calabash-driver