Fix fabfile.
Merge branch 'master' into aqueous_compatibility
Merge branch 'aqueous_compatibility' of github.com:materialsproject/pymatgen into aqueous_compatibility
Cleanup.