fixed .gitignore to be more specific about exclusions
added missing branch-alias in composer file
Update composer.json

Bump doctrine dependency for symfony 2.1 users.
merged branch guilhermeblanco/patch-1 (PR #498)

This PR was merged into the 2.1 branch.

Commits
-------

b118637 Update composer.json

Discussion
----------

Update composer.json

Bump doctrine dependency for symfony 2.1 users.
updated VENDORS for 2.1.8
Merge tag 'v2.1.8' into 2.1-DoctrineFixturesBundle

created tag 2.1.8