Don't depend on clojure.tools.cli
Move cards and makemap into separate files

Also remove unused code, and rename *bookmarks* and *bookmarks-file*