Merge pull request #402 from stloyd/bugfix/update_token

Update the token after successful connection.
Some cleanup of code:
- type-hint objects when possible,
- don't use container parameter in constructor
- reduce usage of container
- remove some code duplication
- made configuration a bit more readable
Refactor code to use Symfony OptionResolver component
Fix problem with twig extension after refactoring, cleanup after review