Restore web tests
remove setup.py test
merge rules
Remove sentry.options
Some initial work towards pulling out angular changes