merge in master and rebuild
Merge branch 'feature/variant_images'
add back in the variant images
pull in recent public master
make option selector work in all cases
fix uniform images at all sizes
Merge branch 'master' into chateauboutique

Conflicts:
	Bootstrapify.zip
uniform thumbnails grunt