Updated to remove custom functionality.

The tests won't actually pass yet. I updated this to run under
the file-mapping branch that is in grunt as was doing some testing
and thought I'd contribute it back.