Re-enter merlot and add country and grape to missing white
Merge pull request #81 from mud-turtles-2014/tasting_feedback

Re-enter merlot and add country and grape to missing white