Better shell and vim snippets.
Scratch buffer and Ag fix.