PEP-8 compatible style fix
Merge branch 'master' of github.com:saitoha/tff

Conflicts:
	tff/tff.py