Update to 2.2 onwards

Update the bundle to work with symfony 2.2 onwards.