Master position and slave position now use RPCs.
StopSlaves & GetSlaves use RPC only now.
Merge branch 'replication'
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
No more flakyness in this test.
Bigger timeout.
Adding extra logging.
Merge branch 'master' of github.com:youtube/vitess
Fixing these files.
Merge branch 'new-binlog-streamer'

Conflicts:
	go/vt/tabletserver/rowcache_invalidator.go
fix merge error: delete states