Allow override of I18n.t method
Merge branch 'override_function'

Conflicts:
	spec/pattern_matcher_spec.rb