cleanup
Merge branch 'develop' of github.com:icereval/waterbutler into develop