update for beta baseline
Merge branch 'master' of https://github.com/cheesie67/flowstation

Conflicts:
	flowstation.py
	test_flowstation.py
Update for beta release