distribution files changed again
merge tests updated
grunt changed again
better exporting of the merge function for tests