Squashed commit of the following:

commit 5ce608544937b2806f48a77e8f015484ebebec13
Author: Lars Kruse <lak@praqma.net>
Date:   Wed Dec 3 20:21:00 2014 +0100

    fixed hosts and sponors