updates to surface.py
Merge branch 'surface' of https://github.com/materialsproject/pymatgen into surface

Conflicts:
	pymatgen/core/surface.py