Merge pull request #483 from pedrovma/spreg18

Forwarding Phil's commit: skipping doctests, conditional skip of unit tests
ENH: cleaning up more test generated files
DOC developers
ENH errant files only created locally not on travis
Merge pull request #484 from sjsrey/docs

ENH: cleaning up more test generated files
Serge: More tests to skip if scipy less than 11