fix an issue in BSPlotter due to six.move.zip used to replace zip. the six zip actually gives an iterator and not a list and this was breaking the code.
Merge branch 'master' of github.com:materialsproject/pymatgen

Conflicts:
	pymatgen/electronic_structure/plotter.py
Support as_from dict for Slabs. Also added a str method for easier debug.
Remove print.
Merge branch 'master' of github.com:materialsproject/pymatgen
Merge remote-tracking branch 'trunk/master'
Minor changes