rebased gtr-rebase-me

Rebased gtr-rebase-me, and hopefully I did so correctly! 
I was going to try to think up a funny commit message, but then I realized I want to play pokemon instead.