Alpha: Diff words rather than chars

Experimenting this seems like a much better idea
I think this will make jgonera happier :)

Change-Id: I78b37acb0a85575870f316a9ad679a1305da7093
Merge "Alpha: Diff words rather than chars"