Update Cask require to use brew
Move custom elisp files around to avoid error