Added travis build.
Fix PEP-8 code style
Merge pull request #3 from ogdch/pep8

Fix PEP-8 code style
Merge branch 'develop'

Conflicts:
	setup.cfg