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