Merge pull request #17 from jhallbachner/master

Update composer.json for 2.1.x dependencies