Bump version and make VERSION consistent with setup.py