Exchanged service definitions to make use of the ExpressionLanguage component of Symfony.
Merge pull request #3 from daFish/master

[WIP] Incorporate changes from recent library additions