Revert "fix Calabash Spec for #738 changes"

This reverts commit 4f002f399cd6a28a76f1e83b72ff954f74f6ecfb.
Added flatten => true for 0.16.4
Merge pull request #1349 from GWStuartClift/master

Prefer :flatten => true over path fix