Updates to
Updates to diff.inc
Updates to Kaleidoscope plugin. Still a WIP.