Fixing mean to behave correctly for floats.
fix merging
Merge remote-tracking branch 'beta/master' into median-tests
add an imcomplete implementation of median
reverted to older working copy of stats.py