merge drop_puppet
Merge
Merge remote-tracking branch 'youdevise/master'
Fix the tests to fail correctly as removing branches is broken
And fix
Merge pull request #4 from Yelp/master

Fix remove_branches functionality.