Merging in changes, *possibly* fixing input issues.

Signed-off-by: Daniel Shumway <shumway.danny@gmail.com>
Merge branch 'master' of https://github.com/danShumway/python_math