Final commit to master to fix fileiotasks.
Merge branch 'master' of github.com:materialsproject/fireworks

Conflicts:
	fireworks/user_objects/firetasks/fileio_tasks.py
	scripts/fwtool