combine paredit-plus with subpar; upgrade code mirror
Merge branch 'paredit'