Updated for Travis-CI integration and pep8 compliance.
Merge remote-tracking branch 'origin/develop' into develop