Added ConditionallyRequiredPlugin and util.indexOf wrapper for array.indexOf
Fixes to logic
Updates to validators.