Merge branch 'hotfix/branch-aliases'

Updates branch aliases to point dev-master at 0.2.x-dev and
dev-release-1.0.0 at 1.0.x-dev.

Author: weierophinney

composer.json

@@ -54,7 +54,8 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.0-dev"
+            "dev-master": "0.2.x-dev",
+            "dev-release-1.0.0": "1.0.x-dev"
         }
     },
     "scripts": {