Merge pull request #1 from alexandre-normand/capture

alexandre-normand adding captures for @bewest et al.
add more discussion
nix swp files
simplify output
add discussion for @alexandre-normand
rehex dump logs for nicer viewing
Incremental capture with matching data.