Merge pull request #1 from JustinSGray/master

Pull Justin's latest back to my branch
update for new way to specify reactants and update the tests
merge
stuff
stuff
Merge pull request #2 from JustinSGray/master

Update for justin's latest
update GIT testing to better match CEA
stuff
merged tom's changes and changed to FlowStation, FlowStationVar for class names
fixing components for name changes