Revert "[FIX] Handle no custom dir being specified"

This reverts commit cde98e485a93c7e7cf81a08cf1322b8f3ae4449b.
[FIX] Tempory revert of custom_dir changes to fix travis build - further discussion and updated spec pending. See #84