Beer Genre and Food Flavor factories

I researched using the association method, and it seems to be
the simplest and surest thing for us for now. I'm not 100% on how
it will play out, and there were no good solutions for setting up
a many-to-many factory. At this point, we aren't rigorously testing
with these two factories because they're seeded in mostly; not
dynamic with the user interaction.
merge for jasmine testing
resolve merge conflict to bring this branch up to date

rebasing on top of master Tuesday July 8 9:15 AM PST
Merge branch 'factory_girl_spec' into flavor_specs_and_tests

Bringing two testing branches together because they were laying
separate from each other and in disrepair.

They are still in disrepair; just now they're together.

Conflicts:
	spec/models/food_flavor_spec.rb
Merge branch 'flavor_specs_and_tests' of https://github.com/fence-lizards-2014/amber into flavor_specs_and_tests

Resolve Conflicts, just bringing branch up to date with master:
	app/controllers/beer_genres_controller.rb
	spec/models/food_flavor_spec.rb