Fixes #77. Update friendly_time resolution and add tests
Remove incongruous explicit return
Merge branch 'friendly-time-fix'

Conflicts:
	spec/models/tea_time_spec.rb