Fixed changes for chapter 2 and 3
Worked on making heat transfer formulations more consistent

This closes #150.