a cleaner travis configuration
Merge branch 'master' of https://github.com/honeynet/beeswarm

Conflicts:
	.travis.yml