empresa-0.4 - Travis & Coveralls + pep8 + sphinx
Merge remote-tracking branch 'origin/master'

Conflicts:
	.travis.yml