Merge branch 'master' into ashhilton
misc
Merge branch 'master' into ashhilton

Conflicts:
	dist/scss/styles.scss
	theme/assets/_base.css
carousel caption colour, media heading margin, navbar form size
unused css
zip
Merge pull request #159 from luciddesign/ashhilton

carousel caption colour, media heading margin, navbar form size