Merge pull request #447 from simensen/composer-branch-alias

Added a branch alias for dev-master.

composer.json

@@ -31,5 +31,10 @@
     "autoload": {
         "psr-0": { "Composer": "src/" }
     },
-    "bin": ["bin/composer"]
+    "bin": ["bin/composer"],
+    "extra": {
+        "branch-alias": {
+            "dev-master": "1.0-dev"
+        }
+    }
 }