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