Remove buggy highlighting
Update README
Add paredit
Add ConflictDetection and ConflictMotions