change version parsing in setup.py
Merge branch 'master' of github.com:lovelysystems/lovely.pyrest

Conflicts:
	lovely/pyrest/__init__.py
modified the documentation output
fix tests
Merge pull request #24 from lovelysystems/enhanceddocugenerator

Enhanceddocugenerator