merge in master and rebuild
Style shipping calc message
recalc shipping rates on ajax cart update
use Shopify for formating money instead of Currancy
update uniform thumbs
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
dont fix navbars if screen height is less than 800
use ie8 compatible jquery
rebuild
fix slider image expanding passed the screen width
grunt
Merge branch 'master' into ashhilton

Conflicts:
	Bootstrapify.zip