Fix up cider integration, mostly work out line parsing
Further refine parser, finish out tests