Merge branch 'master' into multidef

* master:
change test to use different postcode now that dummy data has changed
Merge pull request #506 from ministryofjustice/multidef

Merge branch 'master' into multidef
Merge branch 'master' into fee_account