on the way to actually integrating this into versioned_record
conflict detection is broken.  looking at diff now.
found bug in differ, the test on line 150 fails
found and fixed bug in the case where the beginning of text doesn't match
all tests are passing
Merge pull request #13 from GoBoundless/refactor_strings_working

Refactor strings working