Merge pull request #23 from Decisiv/prefix_and_path

Allow both prefix and path via prefix_with_path
Allow override of I18n.t method
Merge pull request #28 from Decisiv/default_test

Add tests for add_default => false
Merge branch 'override_function'

Conflicts:
	spec/pattern_matcher_spec.rb
Merge pull request #29 from Decisiv/update_readme

Update readme with new flags
Merge remote-tracking branch 'upstream/master'

Conflicts:
	bin/i15r
	lib/i15r.rb