zippy
update
badges
convert product descript tabs to use body content, not metafields
fix search pagination isues; closes #207
get zippy
download latest theme files
pull in latest bs master
update dependancies
Fix features loop content excerpt
Tidy up search results
Fix sidebar nav gltich
Fix free shipping js
Merge branch 'master' of github.com:luciddesign/bootstrapify into luciddesign-master

Conflicts:
	theme/templates/search.liquid
Merge branch 'luciddesign-master'