Updating to use new version of resin
Updating to use new version of resin. Added  test for sourcemaps.
Merging with master