Revert "Merge branch 'master' of martinbroder.com"
This reverts commit 169f8a8d899c7787209a204fb373608bee30ec4b.