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 #9 from tylerdooling/master

Adds interactive merge feature, fixes tests, and refactors code for merging with existing locale file.
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
Test that simple variables are not butchered
More tests for ruby code
Test apostrophes in text
Failing test for internationalization of variables
Failing test for internationalizing text with escaped ampersands
Merge pull request #33 from p-originate/tests

More tests
Don't internationalize lines that only contain numbers
Merge branch 'master' of git://github.com/balinterdi/i15r

Conflicts:
	lib/i15r/pattern_matcher.rb
Add skip to interactive mode.