Update parallel_tests to v0.16.10.
Configure travis to use parallel test runner.
Initializer not needed after switching to devise_zxcvbn
Don't need Devise::Models::Strengthened either
Merge pull request #201 from alphagov/remove-passphrase-entropy-initializer

Remove unused passphrase entropy files
Revert "Don't need Devise::Models::Strengthened either"

This reverts commit d259adc131634a0ec562f5b0b1ec9444d94f5f8d.
Revert "Use zxcvbn instead of passphrase_entropy"

This reverts commit 9466439e7528ff74a44b1ae45ea88c49fc9fc4c1.

Conflicts:
	Gemfile.lock
Merge pull request #202 from alphagov/revert-password-strength

Revert password strength
Revert "Initializer not needed after switching to devise_zxcvbn"

This reverts commit e067ec1d7468cd54434d0de9e1b1a4f437c577d4.
Fix password reset

Seeing this error in production.

A TypeError occurred in password_expired#update:

  can't convert Symbol into String

activesupport (3.2.17) lib/active_support/dependencies.rb:251:in `require'
  activesupport (3.2.17) lib/active_support/dependencies.rb:251:in `block in require'
  activesupport (3.2.17) lib/active_support/dependencies.rb:236:in `load_dependency'
  activesupport (3.2.17) lib/active_support/dependencies.rb:251:in `require'
  devise_security_extension (0.8.0) app/controllers/devise/password_expired_controller.rb:27:in `resource_params'
  devise_security_extension (0.8.0) app/controllers/devise/password_expired_controller.rb:14:in `update'
  actionpack (3.2.17) lib/action_controller/metal/implicit_render.rb:4:in `send_action'
  actionpack (3.2.17) lib/abstract_controller/base.rb:167:in `process_action'
  actionpack (3.2.17) lib/action_controller/metal/rendering.rb:10:in `process_action'
  ac
Merge pull request #203 from alphagov/password-reset

Fix password reset
Add spec to cover resetting expired passwords
Merge pull request #204 from alphagov/password_tests

Add spec to cover resetting expired passwords
Fix environment for cron rake tasks

We want rake tasks under cron to have the correct environment variables
available to them.
Merge pull request #206 from alphagov/cron-rake-environment

Fix environment for cron rake tasks
Update realisation figure from £12,341.85 to £3084.85
We don't have 1.9.3 in the training environment

Need to downgrade to run it there.
Merge pull request #223 from alphagov/downgrade-exception_notification

We don't have 1.9.3 in the training environment
Fix import

Rack version was introduced in v4.x. Back on 3.x for now.
Merge pull request #200 from alphagov/state-aid-refactor

Move state aid calculation out of the premium schedule