Revert "Refs #18. Revert later, attempting to resolve travis error"

This reverts commit dcb397016cb860a657bd84cd9f5013f82f16c502.
Refs #18. Revert later, attempting to resolve travis error