Fix ARGV parsing
Context diffs have a two-character prefix
Add some more gutter characters to diff