only test master in travis
Merge branch 'master' into 0.0.6
tracked down the tmp file issue - dummy app tmp dir doesn't exist initially (duh)
Merge branch 'master' into 0.0.6