Require spec helper from integration spec_helper
Merge branch 'master' of github.com:zombees/zombees