External Compare and Merge Tools 2.0

updated to version 2.0. Some bug fixes and code clean up. Mostly the same functionality.

@ablock42, you were correct that was a bug. Its fixed in version 2.0.