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