Merge pull request #250 from jlipps/master

example of automating preferences.app
updated iOS-specific text to mention Android support
Merge pull request #251 from sah/master

README updates re: Android support
don't need mobileSafari grunt command now that it's built in to appium
move ios args into an object for sanity
force instruments to launch app by iphone/ipad
launch iphone/ipad depending on desired cap, plus tests
command-line params for forcing iphone/ipad