Merge with coffeescript - fixes stacktraces

This merge with coffee-script fixes bug which was causing getSourceMap to fail. Without sourcemaps, coffee/iced frames in stacktraces had wrong line numbers.