Merge branch 'master' of https://code.google.com/p/aquarius-chem
Merge branch 'master' of https://github.com/devinamatthews/aquarius