Merge remote-tracking branch 'upstream/master'
Evaluation points have equal gap
Merge branch 'master' of https://github.com/mbkumar/pymatgen
Automatic Py3k merge for testing