Individual servers can now pass back information to the router if they try to serve the wrong page type
Merge branch 'master' of github.com:guardian/frontend into content-type-redirects
Merge pull request #440 from guardian/content-type-redirects

Individual servers can now pass back information to the router if they t...
X-Accel-Redirects need to be on 200 response codes
Merge pull request #442 from guardian/content-type-redirects

X-Accel-Redirects need to be on 200 response codes
Now shows expired content message for expired content instead of a 404
New test resource files
Disable Witness tests for now, they need total re-working
New test files
Merge pull request #443 from guardian/expired-content

Expired content
Reallllllly sick of that test
Re-enabling witness
Made content api timeout configurable
Merge branch 'master' of github.com:guardian/frontend into witness
Deleted old data files
File for witness tests
Article test files
Front test files
Section test files
Tag test files