Avoid infinite loops in LinearAssignment
Merge branch 'master' of github.com:materialsproject/pymatgen
Automated merge for py3k testing