Changed git notes.
generated globals
Changed wineries.  Input fields are more clear.  Index page is paginated.
Minor changes to bottle controller.  Removing debug messages.
Minor changes to notes.
Intermediate commit to merge master back into this branch.
Merge branch 'master' into 20131202_additionalSearch_feature
Changed search feature... changed check boxes to radio buttons for bottle types