Rebased on to marionette-spike branch

commit 6c175a0bdbde81ebd7759eaf35051517ac7fd35e
Author: Michael Marconi <michael@modeltwozero.com>
Date:   Wed Jun 26 17:36:13 2013 +0200

    WIP

commit 04696e6c9370f805f4f70e3c8bb41f0092a8c79f
Author: Michael Marconi <michael@modeltwozero.com>
Date:   Wed Jun 26 16:40:18 2013 +0200

    Run test jobs

commit da6ef42944619cd47a88b5442fdc1ac0715799d9
Author: Michael Marconi <michael@modeltwozero.com>
Date:   Tue Jun 25 23:46:18 2013 +0200

    Toolbar layout complete