Reset for a new bootcamp 2014-01
Fixing mean to behave correctly for floats.
merging upstream