kill shinjuku alias on tokyo
Merge branch 'master' of github.com:foursquare/twofishes