switch from nrepl mode to cider mode
make org mode code look better and turn off paredit wrapping
Merge remote-tracking branch 'tmp/master'