Small filesystem cleanup w/Patrick
Updated .gitignore
Merge branch 'master' of github.com:prefiat/water-monitoring

Conflicts:
	.gitignore
	System_State.yaml