Squashed commit of the following:

commit c6261187e984def0d3a0a1b028ad0ca867dd70b5
Author: Bussmeyer <thomas@gretel-2.local>
Date:   Mon Jan 21 21:37:26 2013 +0100

    Uncomment the whole config.

commit dd4a496007016eb798b91c86716aaeb8a1cdbf0f
Author: Bussmeyer <thomas@gretel-2.local>
Date:   Mon Jan 21 21:36:18 2013 +0100

    Add verbose mode.