Added optional dependencies in a way that the build does not break
Merge pull request #1200 from ryanjbaxter/master

Added optional dependencies in a way that the build does not break