Squashed commit of the following:

commit c528fcf0d340eae3c64ef4101d947fc87a1812ae
Author: Larry Hosken <lhosken@twitter.com>
Date:   Mon Mar 3 11:37:22 2014 -0800

    incorporate feedback: fix formatting

commit 4566d918c4325eca7d9d72274c7730763d7dc96c
Author: Larry Hosken <lhosken@twitter.com>
Date:   Mon Mar 3 10:24:41 2014 -0800

    docs += Travis-CI status badges in a couple of places