Switch to the fixed Cabal branch in CI and add a fix for Natural (#640)

Authored by alpmestan on Jun 27 2018, 2:59 PM.