scala automatically updated this. freaky.
Merge branch 'master' of github.com:guardian/frontend
Put verification analytics back in
Put verification analytics back in
Merge branch 'master' of github.com:guardian/frontend into omniture
Moved Diagnostics onto single config file
Merge branch 'master' of github.com:guardian/frontend into configuration
Killed off unnecessary merge for diagnostics
Put IDEA settings back in
strip html tags from caption/alt attributes on trail images
upcoming fixtures component working on competition front
cleaning using jsoup, so html entites also inserted
adding factory to make drivers, and bespoke expectations
Merge pull request #354 from guardian/image-alt-tag-fix

Strip html tags from caption/alt attributes on trail images
Merge branch 'master' into football
updated tests to work with htmlunit
Added new teams to competition list
Remove proxy setting from sbt script.
ability to use different drivers
don't use attribute css selector (mainly because htmlunit cant handle it)