lumped commit. Look at changes if you care
Merge branch 'master' of https://github.com/mganger/BlackBody-Radiation