Merge branch 'master' into blackenbrook
grunt
Merge branch 'master' into blackenbrook

Conflicts:
Bootstrapify.zip
zip
custom links and images meta
uniform thumbnails
newsletter signup form mail chimp updates
sidebar nav functionality tweaks
Merge branch 'master' into blackenbrook

Conflicts:
	Bootstrapify.zip
Merge pull request #200 from luciddesign/blackenbrook

mailchimp newsletter signup form tweaks and sidebar nav functionality stweaks