fix unlock retry logic so we actually unlock (fix #1295)
Merge pull request #1347 from jlipps/master

fix unlock retry logic so we actually unlock
remove .appiumconfig on reset
so we don't run into situations like reset.sh --[device] and then
appium won't start because other devices were configured at
a previous version
upgrade express so we don't get warning messages
Merge pull request #1348 from jlipps/master

misc fixes
change order of unlock regexes
replicate @snevesbarros reset fix for building safari
update all examples to use correct desired caps
we don't want people getting confused!
Merge pull request #1351 from jlipps/master

couple misc fixes
Made test.sh sh compatible (removed bashisms). Made test.sh not rely on mac-only tooling. Small documentation tweaks in readme and contributing doc.
Merge pull request #1353 from filmaj/sh-compat

Shell compatibility w/ test.sh
Change name of capabilities method for sauce_example.rb to prevent us trampling a protected method
Merge pull request #1354 from DylanLacey/master

Don't monkey-patch "capabilities" as this is now apparently a defined method
copy status and xpath to uiauto instead of linking
so they get picked up appropriately by npm
Don't set Content-Length header for http POSTs with empty body.
(Android) Correct handling of 'element{Displayed|Enabled|Selected}'.
Merge pull request #1358 from jlipps/master

copy status/xpath instead of linking
Merge pull request #1357 from paymand/element_methods

Element methods
add some more caps to docs
Small typo fixes in docs and expanded on android setup for mac osx