Rebase from master

commit 3472011e88649d69cd487e2902f1360c3a6568fe
Merge: 84033b3 d25aa68
Author: Matthew Smith <matthew@spleep.co.uk>
Date:   Thu Mar 28 07:22:14 2013 -0700

    Merge pull request #29 from michaelmarconi/default-config

    Comment out unused default configuration.

commit d25aa68531d465b01db3fc0a9d6737cd2595f1fc
Author: Matthew Smith <matthew@spleep.co.uk>
Date:   Thu Mar 28 14:20:56 2013 +0000

    Comment out unused default configuration.

commit 84033b3eae6535f1cc8b323d97fa713c1f4ef58b
Merge: 197862b 41c727c
Author: Matthew Smith <matthew@spleep.co.uk>
Date:   Thu Mar 28 06:43:49 2013 -0700

    Merge pull request #28 from michaelmarconi/worker-checked-exceptions

    Workers can throw checked exceptions

commit 41c727cded5b61a44f5424d385c55e9ceb8b7d70
Author: Michael Marconi <michael@modeltwozero.com>
Date:   Thu Mar 28 13:25:10 2013 +0000

    Workers can throw checked exceptions

    I've also taken the chance to refactor the worker out into its own project, where it should already have been!