corrected %s format in error message
Upstream Merge

branch 'dev' of https://github.com/agnwinds/python into dev
Edited q_recomb to prevent NAN problems
Some comment changes
Merge branch 'dev' of https://github.com/agnwinds/python into dev
added some comments
Merge pull request #65 from jhmatthews/dev

Fix for q_recomb returning NAN
Upstream merge to bring in q_recomb fix.

Merge branch 'dev' of https://github.com/agnwinds/python into matom_adiab