Initial commit
Merge branch 'master' of https://github.com/darcyabjones/headwater
Merge branch 'master' of https://github.com/darcyabjones/headwater

Conflicts:
	headwater.py
Merge branch 'master' of https://github.com/darcyabjones/headwater

Merging adams updates
Merge remote-tracking branch 'origin/master'

Merging adams changes
Fixed naming problem