(preliminary) multiscale activity plot magic
Fixed Juha's wrong closing tag!
Fixed lost X-axis

I swear git ate it!
Made plot take promises and adapt interpolation style

So it's also a granny-friendly histogram now!
Added activity weighting
Merge remote-tracking branch 'jami/master'

Conflicts:
	parliament/views.py