removed unnecessary else statements
Pin sphinx version to 1.2 in tests.

Sphinx 1.2.1 has a bug that breaks our build:
https://bitbucket.org/birkenfeld/sphinx/pull-request/212/fix-an-exception-introduced-by/diff
Merge pull request #976 from daftshady/master

removed unnecessary else statements