update requirements to support Symfony 2.1 release
enhance composer.json

Enhance syntax and force symfony2 requirements to 2.2 version.
fix symfony requirements
Merge from upstream/master
Upstream merge and update deps