Proper testling support.
Squashed commit of the following:

commit 68fb14c22005b8fc31e1d3acfcd50e939c4d8460
Author: Joshua Newman <josh.newman@vodori.com>
Date:   Sat Jul 13 20:41:05 2013 -0700

    I think these aren't running on testling.

commit e2a03bda99b32119d566201b415a6c34ceda482a
Author: Joshua Newman <josh.newman@vodori.com>
Date:   Sat Jul 13 20:40:01 2013 -0700

    Apparently testling was working, but only for master.