Merge pull request #6 from nollenr2/master

Pulling search changes.
Merge pull request #7 from nollenr2/master

database.yml production info
Merge pull request #8 from nollenr2/master

config/environments/production.rb
Merge pull request #9 from nollenr2/master

Changes for dbmigrate and dbseeds
Merge pull request #10 from nollenr2/master

Entry form changes.
Merge pull request #11 from nollenr2/master

Changes for bottle entry - fixed radio button field.
Merge pull request #12 from nollenr2/master

Downloading cvs file.
Merge pull request #13 from nollenr2/master

Added date_added_to_cellar and notes.  Fixed CSV headings.
Merge pull request #14 from nollenr2/master

Winery list, add and edit.
Merge pull request #15 from nollenr2/master

Add index to wineries
Merge pull request #16 from nollenr2/master

Add index to wineries
Merge pull request #17 from nollenr2/master

Added foreign key from bottles to users
Merge pull request #18 from nollenr2/master

Pull change for default search.
Home page display corrected if user is already logged in
Multi-Bottle add with confirmation page.
Commented out logging commands used for debugging.
Added an after find to the bottle controller to copy the bottle_id into the bottle_id_text field.
Menu item 'list grapes' was not working.  Help page text was updated.  The grapes are now being listed in alphabetical order.
Added message if search returns no results.
Added some git notes in the 'versioning notes' file.