Merge pull request #162 from jlipps/master

make functional tests all pass
Merge branch 'master' of github.com:appium/appium
allow finding of alerts