Rename features to index-features
tewaks to colorbox
Merge branch 'master' into blackenbrook
color box stuff
change collection grid class to extend col class
zip
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*
carousel speed setting
Merge branch 'master' into blackenbrook

Conflicts:
	Bootstrapify.zip
update uniform thumbs
Add setting for using an icon font for the logo