Merge pull request #14 from javierj/master

Improving test_isentropic.py
Added TODO to remove magic in Shock
pep8 cleanups in test_isentropic.py