Add 'xspy'.

Resolves #234
xspy: Clean up and add a small sed patch.
Merge branch 'xspy'