Merge pull request #933 from isuftin/master

"Continue With Defaults" fix, Added Source to matching window, mustachio'd the column matching modal window