Bump version and update/cleanup on setup.py