Update capabilities and appium.txt
Rename test folders
Merge pull request #142 from appium/wip

Update capabilities and appium.txt