Make the smoke-test timeout two minutes longer

Travis is sometimes *very* slow.
Added #915 to the CHANGELOG
Do not clobber window.ENV.