Merge pull request #784 from Kixeye/0.9.x-fixjsonrender

JSON[P] Render Bugfix (0.9.x)
Merge pull request #740 from Kixeye/0.9.x-graphlot-viewnow

Graphlot - Patch to fix incompatibility introduced by 28bbd7f9
Fix indentity function -- convert time.mktime floats to int for start and end time values
Merge pull request #807 from dpkp/dpkp/fix_identity_function_0_9_x

Fix identity function (0.9.x)
Merge pull request #41 from Kixeye/0.9.x-upstream-changes

Pull in Upstream Changes