Fix null args.app
Merge pull request #1341 from bootstraponline/master

Fix null args.app
refactor ios.js option passing
allow desired cap launchTimeout to tell appium how long to wait before declaring instruments unresponsive
retry getting a session in appium tests (fix #1326)