Update BundleItem class
Update BundleItem spec
Remove clumsy FactoryGirl associations -- need to think of better way to create associations