Fixing mean to behave correctly for floats.
added median to stats.py
merging the fixes to stats.py
Merge remote-tracking branch 'kkiesling/master'

Conflicts:
	stats.py