reshuffling tests
Merge pull request #1871 from sebv/test-step3

Test reformatting 3, moving tests around.
Merge branch 'master' of https://github.com/appium/appium
Allow to use reset.sh from git-bash in Windows
Allow spaces in Appium folder