Merge pull request #3 from JustinSGray/master

Just some code cleanup stuff.
get the simple model working
Merge branch 'master' of https://github.com/cheesie67/flowstation
merged toms stuff
stuff