A few fixes I missed when updating
Merge branch 'master' of github.com:dcramble/symfony-2.3.x-presbundle