More package cleaning, more robust Vignette.

[SimonGoring]

Resolved some upstream merge issues. Added some new files, and started unit testing more comprehensively. Just going through the check.log to try to fix as much as possible.