Switch over to daisy branches wherever possible

Signed-off-by: Ash Charles <ashcharles@gmail.com>