Merge branch 'master' of https://github.com/mud-turtles-2014/wine-tasting
Merge branch 'tasting_notes'
Merge branch 'master' of https://github.com/mud-turtles-2014/wine-tasting
Move fruit condition to original tastings migration
Remove standalone fruit condition migration
Merge pull request #93 from mud-turtles-2014/update_migrations

Update migrations