Fixing merge conflicts.

Author: KevinDonaldson

README.md

@@ -12,17 +12,20 @@ Complete and simple to install Composer autoloader or Magento
 
 ## Installation
 
-### Get The Files
-
-Add `"mattwellss/magento-composer-autoloader": "~0.1"` to your `composer.json`'s `require` node. Also, **don't forget** to add the following to `repositories`!
+Until it's listed in packagist or firegento, add the repository to your `composer.json`:
 ```json
 {
     "type": "vcs",
     "url": "https://github.com/mattwellss/magento-composer-autoloader"
 }
 ```
 
-This should only be a temporary solution until the project is listed on a real composer registry!
+Add the library to your `require` section:
+```json
+"require": {
+    "mattwellss/magento-composer-autoloader": "~1.0"
+}
+```
 
 ## Configuration