Remove composer.lock from gitignore
Add composer.lock
Make phpunit config colourful and consistent
Short array syntax, space after function keyword
Improve naming of things
Add a space between function keyword and '()'
Merge branch 'master' into improvements

Conflicts:
	README.md
	examples/silex/app.php
Merge branch 'improvements'