Merge pull request #1222 from jlipps/master

don't hardcode xcode dir in getBuiltInAppDir (fix #1216)
make test.sh distinguish between testfiles
create driverblock.it to handle async mocha errs
handle beforeEach and afterEach errors better in driverblock