Delete config.yml
Meta Links
Merge branch 'master' into bootstrap3/darryn
activate theme settings styles
fix google fonts snippet
Merge branch 'master' into bootstrap3/darryn
rename bootstrap files
delete 'show sidebar' setting conditional on homepage

was preventing all thumbnails from displaying on homepage
homepage collection image bug
add clearfix for horizontal product alignment on collection pages
tidy up currency cinverter
starting to develop search field
Merge branch 'bootstrap3/darryn'

Conflicts:
	theme/assets/_settings.scss.liquid
bootstrap updates