gaussian water
Merge branch 'water1' of github.com:mpharrigan/mixtape into water1

Conflicts:
	Mixtape/featurizer.py
Doc formatting
Contributor
Complete documentation
SOL
SOL
SOL

Conflicts:
	Mixtape/commands/atomindices.py
Merge pull request #127 from mpharrigan/water1

[WIP] Water