updated to Symfony 2.6, includes some minor additions and simplifications