added Structure.merge_sites
Merge branch 'master' of github.com:materialsproject/pymatgen
allow for finding supercell matrix, translation vector, and site mapping
using StructureMatcher
Automatic Py3k merge for testing