don't write a bunch of node code just to do some simple platform-specific shell commands that might break with new versions of node
Merge pull request #962 from jlipps/master

simplify reset.sh and gruntfile by using shell instead of node
default tests to use chrome not chromium
make sure we call back with an error and not a string
add test.sh to make it easier for devs to test important stuff
make sure test.sh arguments are passed correctly to mocha
fix another bind(this)
Merge pull request #963 from jlipps/master

misc fixes
get rid of some commented-out debug statements
bump and update to v0.8.3 for npm publish
Update real-devices.md
Merge pull request #965 from prolificcoder/patch-1

Update real-devices.md
add appwaitactivity to driverblock for android
remove mention of 'grunt appium'
give the appium server a very big http socket timeout.
sometimes it can take a very long time to start an app, during which we haven't responded
with a new session response yet. the server was dropping the connection to the client
in these cases. the timeout prevents the connection from being dropped.
Merge pull request #971 from jlipps/master

give the appium server a very big http socket timeout.
make sure chromedriver retries adb if it fails
fix #969
Merge pull request #972 from jlipps/master

make sure chromedriver retries adb if it fails
--ipa and --app aren't actually incompatible. --ipa needs --app to provide bundleId
Merge pull request #974 from jlipps/master

--ipa and --app aren't actually incompatible