Revert compiler descripter changes.
Was making it impossible to build exe's on Windows, waiting to have a
further discussion with sorlok about what he wants to do.
Merge pull request #832 from RobertBColton/master

Revert compiler descripter changes.