Merge branch 'master' of github.com:EcomDev/EcomDev_PHPUnit

Conflicts:
	shell/ecomdev-phpunit.php

README.md

+<a href="http://www.ecomdev.org/services/magento-development?utm_source=github&utm_medium=logo&utm_campaign=github">![EcomDev](http://www.ecomdev.org/wp-content/themes/ecomdev/images/logo.png)</a>
+
 Magento PHPUnit Integration
 ===========================
 
@@ -73,7 +75,8 @@ If you want to take a part in improving our extension please create branches bas
 
 ###Create your contribution branch: 
    
-        $ git checkout -b [your-name]/[feature] dev
+	$ git checkout -b [your-name]/[feature] dev
 
 
 Then submit them for pull request. 
+

shell/ecomdev-phpunit.php

@@ -121,7 +121,7 @@ Defined actions:
     --same-db     <bool>     Changes same db usage flag for unit tests
     --url-rewrite <bool>     Changes use of url rewrites for unit tests
     --base-url    <string>   Changes base url for controller tests
-
+  
   show-version               Shows current version of the module
 
   change-status              Changes status of EcomDev_PHPUnitTest module, that contains built in supplied tests