Yet more refactoring.
Merge branch 'surface' of github.com:materialsproject/pymatgen into surface

Conflicts:
	pymatgen/core/tests/test_surface.py