add diffing ability
merge master <-> diffs
remove old versions of jquery
Merge branch 'master' into diffs