Merged README conflict

Joe Wallace · Joe Wallace · commit 32dbc659438d · 2012-05-08T12:57:35.000-05:00
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 Not sure what's going on here? Here are the [Laravel docs](http://laravel.com/docs), and here are the [Composer docs](http://getcomposer.org/doc/).
 
-I can't take much credit at all for what's going on here. Pretty much all the credit goes to the [Laravel](http://laravel.com/) and [Composer](http://getcomposer.org/) people.
+I can't take much credit at all for what's going on here. Praise and adoration go to the [Laravel](http://laravel.com/) and [Composer](http://getcomposer.org/) people.
 
 ### Quick Start
 
@@ -102,8 +102,14 @@ Monolog will be available anywhere in your Laravel application, so you could say
 
 ### More thoughts
 
+#### Running ```php artisan composeur::cli:update``` versus ```php composer.phar update```
+
 It's not necessary to use the composeur bundle's Cli task to run Composer. Running ```php artisan composeur::setup``` installs composer.phar in the ```{base}``` directory, so from there you can simply run ```php composer.phar [command]```.
 
-If you choose, you need not create ```application/config/composeur.php```. As mentioned above, after the composeur bundle is setup, you can use it from the ```{base}``` directory, so just create your own ```composer.json``` file there and get going. **Warning:** if you create your own ```composer.json``` and later create ```application/config/composeur.php```, your ```composer.json``` might get eaten.
+#### Not adding ```application/config/composeur.php```
+
+If you choose, you need not create ```application/config/composer.php```. As mentioned above, after the composer bundle is setup, you can use it from the ```{base}``` directory, so just create your own ```composer.json``` file there and get going. **Warning:** if you create your own ```composer.json``` and later create ```application/config/composer.php```, your ```composer.json``` might get eaten.
+
+#### Autoloaders and namespace conflicts
 
 This bundle adds Composer's autoloader to PHP's collection of autoloaders. It's added after Laravel's, so Laravel should have the first shot at resolving classes and namespaces. I suppose this means there is *some* chance of namespaces being resolved by Laravel when you want them to be resolved by Composer, but I guess you can figure that out.
