Reverts previoius commit.

Tests all pass again.  Everything should work.
fixes workspace file
merge problems fixed.
Merge pull request #2 from grizzlyadamson/fix_what_merge_broke

Fix what merge broke