Fix :Diff toggle state
Merge branch 'master' of github.com:allex/etc