Reverse merge of Master to capture Travis CI configuration
authorjordanmccullough <jordan@github.com>
Mon, 30 Sep 2013 19:35:23 +0000 (13:35 -0600)
committerjordanmccullough <jordan@github.com>
Mon, 30 Sep 2013 19:35:23 +0000 (13:35 -0600)

Trivial merge