Removes some debug code that's no longer needed.
Adds some basic function comments
Moves the MergeDictionary function to its onw script
Adds .swp to the gitignore.