Worked on trail pics a bit.

Wrote up a document explaining how we determine trail pics.
Merge branch 'master' of github.com:guardian/frontend into trail-pics
ignore breking codes
not using trailblock-show-more module anymore
don't hide image if inlined
Added more basic discussion tracking and fixed a few bugs
starting to pull in show more ajax style
Adding Bonzo's static methods to $
Merge branch 'master' of https://github.com/guardian/frontend into discussion-tracking
Merge branch 'add-bonzo-static-methods-to-$' of https://github.com/guardian/frontend into discussion-tracking
pull in collection show more over ajax
handle changing viewport size
popular works, again
Use current version of guardianjobs logo

(This logo no longer requires image, as it can be simulated with the
webfont)
Make height of travel search input match neighbouring button
Removed timer and now just tracking discussion when in view
Merge pull request #2528 from guardian/ignore-failing-tests

Ignore intermittently failing tests
adding tests
Removed update to $.js
Adding bonzo for viewport