Zach's first major front end changes.
Updating match.py.
Committed all after cleanup of directories and failed merge with origin/master.
Cleaned up directories that were duplicated or in the wrong place.
Removed all the .DS_Store files polluting the source tree.