Composer: should be dev-master, not master-dev
Merge pull request #26 from danmichaelo/master

Composer: should be dev-master, not master-dev