Cleanup: Refactoring XML output code to facilitate introduction of protocol xml output.
Cleanup: Make the default NSL example use macros.
Merge branch 'compromisingAdversaries' of /home/cas/Dropbox/repos/scyther into compromisingAdversaries