Removed debug statements and some minor other things
 Fix
 Fix stupidity
Fixed damping parameter in water cluster generator script
Merge branch 'master' of https://github.com/devinamatthews/aquarius into symmetry