consistency between "aggregationMethod" and "consolidateFunc" names

first one is whisper's name, second one is graphite's
Merge branch 'f_consowhisper'

* f_consowhisper:
  consistency between "aggregationMethod" and "consolidateFunc" names

Conflicts:
	webapp/graphite/readers.py