minor cleanup of Site.__init__
Merge branch 'master' of github.com:materialsproject/pymatgen