Merge pull request #470 from guardian/story

Add cache control to story page
Fixed JsonNotFound format
Added prop65 as per Richards reccomendation
Track content api timeouts

It feels like we are getting a lot of these lately, Have added a metric to count them.
oops, comment
Merge pull request #475 from guardian/omniture

Added prop65 as per Richards reccomendation
Added international friendlies to list of football competitions
Added international friendlies to list of football competitions that can appear on fronts
Merge pull request #478 from guardian/international-friendlies

International friendlies
Made getCause call null safe
Merge branch 'master' of github.com:guardian/frontend into timeouts
Merge pull request #477 from guardian/timeouts

Track content api timeouts
Merge pull request #479 from guardian/story

Story page v0.2
Merge pull request #484 from guardian/story

Bug fixes for story page and new latest page
Fire a single timeline event. Don't render quote/agent links.
Remove commented out code
Merge pull request #486 from guardian/timeline-fix

Fire a single timeline event. Don't render quote/agent links.
Fixed live matches for a competition page
Merge pull request #487 from guardian/live-matches-bug

Fixed live matches for a competition page
Fix Place model

This is causing 500's in CODE and PROD