Merge branch 'hotfix/composer-branch-alias'

Per zfcampus/zf-apigility-skeleton#58
[#17] Remove unnecessary conditional

- After testing, I realized the conditional wasn't needed in the first
  place. Even if never hit, Json::encode() already "does the right
  thing" with iterators. Added test, and removed the conditional.
Merge branch 'hotfix/17' into develop

Forward port #17