Back to regular travis configuration
Merge pull request #86 from mwcraig/travis-de-patch

Merging without travis build because other PRs in ccdproc have effectively already tested this