Squashed commit of the following:

commit 7d72ca7a39174914c7cdfa7209c9671160e8d146
Author: Philip Kallberg <philip@kallberg.me>
Date:   Mon Apr 14 13:55:42 2014 +0200

    update3

commit 676fefb9470ab392d27ea507af544b7a773ee21b
Author: Philip Kallberg <philip@kallberg.me>
Date:   Mon Apr 14 13:55:21 2014 +0200

    update2

commit fc11b94dff2f6b06ca1df01a86dd20e1050ea137
Author: Philip Kallberg <philip@kallberg.me>
Date:   Mon Apr 14 13:55:14 2014 +0200

    update1

tja