Improve diff highlights

Closes #12 

Preview:

![image](https://cloud.githubusercontent.com/assets/173738/4603998/101bd43c-5182-11e4-9a44-9ea2a5577e9d.png)