Patching a minor regression spec
Adding primary taxon field to product

Conflicts:
	db/migrate/20140522044009_add_primary_taxon_to_products.rb
Adding primary taxon to admin forms

Conflicts:
	db/migrate/20140522044009_add_primary_taxon_to_products.rb
	spec/features/admin/products_spec.rb
Adding primary taxon
Removing some dud test content
Switching the image dimensions
Patching a spec and naming something
Patching which image is rendered
Auto-aligning BEFORE resizing
Fix enterprises spec - primary taxons change
Showing the resizing logo as well
Starting a basic implementation of the Cart/CurrentOrder so we know whether it's empty
Merge branch 'master' into laura_and_will