Updating favicon
Removed custom repo sources from composer.json

We now own the packagist.org repos, no need for manual pointers.
Removed .mergesources.yml, not used since the dark SVN days
Removed .mergesources.yml, not used since the dark SVN days
Merge remote-tracking branch 'origin/2.4' into 3.0

Conflicts:
	composer.json
Added composer.lock and vendor/ to .gitignore
Fixed composer.json regression from 2.4 merge
Reverted junk-commits from "Removed .mergesources.yml, not used since the dark SVN days"

This partially reverts commit 744605d21a8e58966611a4c774b489657f8097ac.
Fixed bootstrap.php path in phpunit.xml.dist
Updated license in readme to include year 2012
Require PHPUnit as dev dependency through Composer
NEW Added "phing phpunit" target
Merge branch 'pulls/phpunit-composer' into 3.0
Added 'phing behat' command
Added default behat.yml
Don't include composer.json in release packages
Remove compass dependency, too slow even for development at the moment

Use compass on CLI instead, or re-add the module manually
via "composer require".

See https://github.com/silverstripe-labs/silverstripe-compass/issues/9
Merge pull request #25 from chillu/pulls/remove-compass

Remove compass dependency, too slow even for development at the moment
Merge pull request #24 from chillu/pulls/behat

Added 'phing behat' command
Added colour to 'phing behat' command