Fix wikipedia tests
Remove travis-build fixes for setuptools > 3.0
Add sphinx documentation
Merge branch 'master' of github.com:lepinkainen/pyfibot
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.travis.yml