tewaks to colorbox
color box stuff
Holy schmawow colorbox
stylz colorbox buttons
move free shipping stuff into js
update free shipping thing on ajax cart update
add cart update btn back in when not ajaxing
align free shipping message text
remove table and thumbnail replacemnts from content formating
only add bottom padding to last .main-content on page
dont show empty testimonials blog wrapper
NESTED COLLECTION MADDESS *happy dance*
Merge branch 'master' into blackenbrook

Conflicts:
	Bootstrapify.zip
age verification
'is sold out' class
mailchimp settings code
metafields to override sidebar menu
theme settings