Changed composer.json to add branch alias
Merge pull request #78 from rjwaring/master

Added branch alias for master
Merge remote-tracking branch 'remotes/origin/master' into 2.0.x