Upgrade to diff-lcs 1.2.2

Force upgrade to diff-lcs 1.2.2
Fix the specs that we deliberatly pending until diff-lcs was updated to v1.2.2
Fix the diff's from @samphippen's work in #238

This aparently should fix travis failures on master and #236