Merge pull request #418 from strangerpixel/master

Al Sprint 3
Remove /assets from local environment
Re-factor news and events feeds using data-attributes
Tidy up no-bullet style
Minor tweaks for news and events feed
Remove conflict cruft