Stop using stats.States in most cases.
Merge branch 'master' of github.com:youtube/vitess
Port back vtgate.py with style changes and bug fix.
Code clean up
Merge branch 'master' of github.com:youtube/vitess
Fixing these files.