Add cl-lib-highlight, remove company yasnippet hacks