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
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
Import Namespace from monty
Merge branch 'master' of https://github.com/gmatteo/pymatgen
Minor refactoring.