Merge branch-alias entries to a single object

Also moved php-cs-fixer dep to require-dev
Merge branch 'hotfix/composer-branch-alias'

Per zfcampus/zf-apigility-skeleton#58