Reverse merge to update TravisCI configuration
authorjordanmccullough <jordan@github.com>
Mon, 30 Sep 2013 19:56:36 +0000 (13:56 -0600)
committerjordanmccullough <jordan@github.com>
Mon, 30 Sep 2013 19:56:36 +0000 (13:56 -0600)

Trivial merge