Revert optional dependency as it is failing the build right now
Merge pull request #1198 from ryanjbaxter/master

Revert optional dependency as it is failing the build right now
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