Merge pull request #191 from cloudbuilders/stable-diablo

switch to using stable-diablo