Fix random broken things
Add :branch to icloud gem reference

I'm just adding this so I can use a bundler local git override.
Actually, let's use Thor instead of Trollop