Fixed action on Cancel button so it returns to the index for new, but goes back to show for edit.  Also changed the wines controller so that failed edits load the edit page instead of the new page.