added usda nutrition csv into db folder
trying to import from csv in seed file
merged w updated master
completed method to import data from a csv in rails - rails has some spec
ial things i had to hack around
removed brand field from ingredient db
added brand field back with a default so it didn't break our app
wrote method for displaying units, quantities, and ingredients in recipes as well as added ingredient quantity and unit fields to the recipe_ingredient table
changed teh csv importer to pull the actual file instead of the fake file
Merge pull request #63 from tararoys/cjo_nutinfo_seed

Cjo nutinfo seed