Fix formatted content issue
Merge branch 'master' into bridgestreet

Conflicts:
	theme/snippets/__formatted-content.liquid
Fix article excerpt issues
Merge pull request #95 from luciddesign/bridgestreet

Bridgestreet