Need to track returning to "../"
Change test.c's ICE message

More vim friendly
Simplify util/test.c
Fix canon_add() - don't pop if last was ".."
Merge branch 'fix/canon-path'