Separate directories for short and long tests
Guard should watch the gemspec
Guard should watch spec/lib and lib/calabash
Merge pull request #8 from calabash/feature/add-lib-and-integration-to-spec-dir

Add lib and integration to spec dir
Merge branch 'develop' into united