Fix changes between symfony 2.1/2.2

I realized today that the changes *weren't* done at the same time. My fault.

Anyhow, here are the changes.

The bundle is still broken, however. I'll do some poking around, but the bundle seems to be causing the firewall to trigger at all times, but with no auth token of any kind, symfony errors out.

```
     [exec] Caused by
     [exec] Symfony\Component\Security\Core\Exception\AuthenticationCredentialsNotFoundException: The security context contains no authentication token. One possible reason may be that there is no firewall configured for this URL.
```

My knowledge of Symfony Firewall is a limited one. If I can't find the solution to the problem, I'll probably open up another issue just to track it.