Tidy up theme settings
Fix order of settings
3 or 4 columns on featured linklist
Merge branch 'master' into bridgestreet

Conflicts:
	theme/config/settings.html
Add page and template classes to body tag
Merge pull request #99 from luciddesign/bridgestreet

Bridgestreet