fix indentation
Merge branch 'master' into develop
fix stdout referenced before assignment
hot realoading of controller
fix pep8 problems on decanter.py
fix test on python 2.7 refs #17
Merge pull request #23 from narusemotoki/develop

hot realoading of controller and bug fix