multiple edits
Merge branch 'master' of github.com:appium/appium
more edits
Merge branch 'master' of github.com:appium/appium
Merge branch 'master' of github.com:appium/appium
various edits, including Android shoutout
Merge branch 'master' of github.com:appium/appium
Merge branch 'master' of github.com:appium/appium
updated with Jason's feedback
Merge branch 'master' of github.com:appium/appium
Merge branch 'master' of github.com:appium/appium
Merge branch 'master' of github.com:appium/appium
give sauce example test a name
fixing merge conflicts
Merge pull request #86 from bernii/master

Fixing merge conflicts of another pull request
misc fixes
tell uiauto how to keep track of whether we're in a web frame
playing around with remote debugger for automating webviews
Merge pull request #88 from sourishkrout/master

Swap flick/swipe
Merge branch 'master' of github.com:appium/appium