re-add changes that got lost in a rebase
re-add changes that got lost in a rebase

jkwatson/eboshi_api_shootout,jkwatson/eboshi_api_shootout,jkwatson/eboshi_api_shootout,jkwatson/eboshi_api_shootout,botandrose/eboshi_api_shootout,jkwatson/eboshi_api_shootout,botandrose/eboshi_api_shootout,botandrose/eboshi_api_shootout,botandrose/eboshi_api_shootout,botandrose/eboshi_api_shootout