Simplify config. Use my copy of SilkJS.
Manual merge