Merge pull request #707 from jlipps/master

android build exit status and noReset fixes
Wait for activity takes an array

Fix #691
Use the same error message on iOS and Android

Fixes #689
Merge pull request #714 from bootstraponline/array_wait

Wait for activity takes an array
reconfigure alerts code so it starts after appium itself launches
remove extra done() from this test
make sure grunt projects respect new exit code cb framework (fix #713)