Add -D option to pass variables via CLI
There is a fallback to json when simplejson is not installed
Merge branch 'fix-requirements'