Updated for combustion 0.4.0
Merge pull request #4 from jcoyne/combustion_0.4.0

Updated for combustion 0.4.0