DRMP tweaks (inc partial merge Michael), Update Flot to v0.8
Merge branch 'master' of git://github.com/flavour/eden
Merge branch 'master' of git://github.com/flavour/ifrc