Fit the test data on screen
Move a few redundant requires and some clutter-y ones
Move matchers into spec/support
Some redundant requires I missed
Merge pull request #4 from alphagov/nit-picking-redux

Nit picking redux