Squashed commit of the following:

commit 026b5d14bf5fb9fc3f84aec17dfa97af058b7bee
Author: Peter Shaw <unthoughted@googlemail.com>
Date:   Mon May 5 23:25:56 2014 +0200

    Module installation

    make module versions more reliable.

commit 82b59542c22a7a1d44d619f11b26596062117e15
Author: Peter Shaw <unthoughted@googlemail.com>
Date:   Mon May 5 23:23:54 2014 +0200

    fix some problems with raw-body and system differences
update email-templates