Using NumPy average for mean.
Merge branch 'master' of https://github.com/kthyng/scipy-2013-git-testing into functions
Pulling updated test_animal methods into local copy.
Updating animal.mean to use NumPy.average.