Rebased to master

commit 281ac626677e032b776049b67f8600eda508d311
Merge: 90c1bf9 6141cf1
Author: Michael Marconi <michael@modeltwozero.com>
Date:   Mon Mar 25 06:19:29 2013 -0700

    Merge pull request #22 from michaelmarconi/refactor-layout

    Refactor layout

commit 6141cf1827e184e3cc034e55c9e0134493b20e63
Author: Martin Foot <martin@modeltwozero.com>
Date:   Mon Mar 25 12:06:07 2013 +0000

    Clear redis before running the robust queue manager tests.

    The scheduler dying test left redis in a bad state with a job still queued,
    which caused an assertion here to fail.

commit 08cfa38f922a3674ee9a030bc53aa7567ba234d7
Author: Martin Foot <martin@modeltwozero.com>
Date:   Mon Mar 25 11:17:05 2013 +0000

    Make timed job tests pass

    Fixed incorrect package name, causing compilation error.
    Added configuration file for timed job tests to set retry time to low time
    Reduce amount of retry from previous tests to make tests run slightly faster