updated code
Merge branch 'master' of http://github.com/moustakas/siena-astrophysics