Add forgotten, uncommitted comment.
Fix bug preventing wine color display.

It's now possible to edit wines in the DB. Add new colors for wines
(port, sparkling) and fix SingleWineView to actually display this
information. Other small things were relating to variable names.