Removed bloated code for old datastructure to prepare for implimentation of new product datastructure
Fixes issues with views caused by removing the datastructure bloat
Update product_spec.rb
more refactoring for new datastructure
update from master
Merged customitems-product-integration branch with master