pretty time should use capital M for month; fixes #3018

Conflicts:
	core/app/helpers/spree/base_helper.rb
	core/spec/helpers/base_helper_spec.rb