add unittest to test_surface.py, delete test_surface2.py
Merge remote-tracking branch 'origin/surface' into surface

Conflicts:
	pymatgen/core/tests/test_surface.py
	pymatgen/core/tests/test_surface2.py