Merge pull request #2500 from reaperhulk/pin-sphinx

pin sphinx to 1.3.1 while we sort out the bytes repr issue with 1.3.2