track the correct merge branch

* * *

This week of work on @hoodiehq is sponsored by Cargo Media.

   Their slogan is “Small Team, Big Impact” and they are hiring
   a Frontend and Backend Dev: http://go.hood.ie/cargo-media