Merge branch 'master' of https://github.com/materialsproject/pymatgen into surface
Merge branch 'surface' of https://github.com/materialsproject/pymatgen into surface
Added new unit tests for LiFePO$ with all polyhedrons present. Added new unit test for LiCoO2, failed
Merge branch 'surface' of https://github.com/materialsproject/pymatgen into surface

Conflicts:
	pymatgen/core/tests/test_surface.py
Made a unit test for LiFePO4 with Fe-O and P-O bonds, no surfaces created as expected, made a test for LiCoO2, only 3 surface should be made in (001) direction, failed