Merge branch 'develop'

Prepping for 2.2.0RC1.
Update composer branch aliases

- dev-master becomes 2.2.0dev
- dev-develop becomes 2.3.0dev
Merge branch 'version/bump' into develop

Bump composer.json branch aliases
Bump Zend\Version
Update README