merge refactor/json-support

Allows JSON files to be included in the project outside of the "root" directory.