added Structure.merge_sites
Merge branch 'master' of github.com:materialsproject/pymatgen