Release...rc/kifli

Merging in changes from rc/kifli to the release branch of configureation
This should probably have a changelog entry as it may break people who don't uninstall the old npm before installing the new nodejs package right?