Fix bad merge commit

I noticed that there was some code in src/test/python/twitter that
shouldn't've been there.  This also uncovered a malformed BUILD and some
broken tests.

The test_status_wildcard still fails if you have /etc/aurora or ~/.aurora
populated with a clusters.json, but this probably won't be true on jenkins.

Reviewed at https://reviews.apache.org/r/16919/