clean up junk
Merge branch 'master' of github.com:kislyuk/cartographer