general UX work
Merge branch 'models'

Conflicts:
	app/views/dives/show.html.erb
Merge branch 'master' of https://github.com/erahm/divelog