cuke tests passing for Ingredient
added associations Item <-> Ingredient
clean up Item Controller
Fixing vendor branch
Adding untracked files
Added association Item <-> Vendor
updated cuke tests for Item
Forgot to push paths
conclude merge
cleaned up after merge
added vendor_steps and moved other cuke tests to 'future cuke'
Merge branch 'master' into item_ingredient_crud

Conflicts:
	coverage/.last_run.json
	coverage/.resultset.json
	coverage/index.html
	features/support/paths.rb
	future_cuke/create_new_delivery_area.feature
	future_cuke/create_user_account.feature
	future_cuke/see_all_delivery_areas.feature
	future_cuke/user_log_out.feature
	future_cuke/user_login.feature
Merge pull request #10 from kishkaru/item_ingredient_crud

Item ingredient crud