Initial commit
Fixing typo in description
Test change to trigger travis
Updates to composer.json and .gitattributes
Merge remote-tracking branch 'symfony/master' into symfony-fork

Conflicts:
	.gitignore
	README.md
	composer.json
Moving files into their new locations
Removing CHANGELOG.md, updating license in composer.json
More work on merging with Symfony
Passing tests
Merge from upstream is complete
Updating README.md
Merge branch 'symfony-fork' into develop