Syntax changes.
Syntax updates.
Merge branch 'dataio' of https://github.com/tomopy/tomopy into dataio

Conflicts:
	dataio/data_converter.py
Fixed conflict.