Incorporate useful symmetry classes from nano106. WIP.
Fix import.
Merge branch 'master' into symm

Conflicts:
	circle.yml
	pymatgen/core/lattice.py
	pymatgen/io/abinitio/tests/test_flows.py
	pymatgen/util/decorators.py
	requirements.txt
	setup.py
Missed one.
Modifs needed for integrating abinitio with fireworks
Merge remote-tracking branch 'mpmaster/master'

Conflicts:
	setup.py
Fix import
Merge remote-tracking branch 'mpmaster/master'
Merge remote-tracking branch 'mpmaster/master'
Merge remote-tracking branch 'mpmaster/master'
Add flow.to_dict, as_dict, from_dict
Re-enable flow.status()
Specify binary encoding for jsoncoders for now.
Merge branch 'master' of github.com:materialsproject/pymatgen
add nosetest for 1d phase diagram
Merge branch 'master' of github.com:materialsproject/pymatgen
Merge remote-tracking branch 'mpmaster/master'

Conflicts:
	setup.py
Merge remote-tracking branch 'mpmaster/master'
Merge branch 'master' of github.com:materialsproject/pymatgen
Fix regressions in setup.py