Merge pull request #16 from rocketu/codeship

Codeship
Fix an issue related to herokuapp in CI
Merge branch 'develop' into codeship