Switch from cl to cl-lib

See discussion in #634.

@milkypostman Not sure if there are any likely to be any issues with this on the build server or Travis, so I refrained from committing this directly.

-Steve