Merge pull request #163 from scottpurdy/master

Revert build flag changes that were causing numerous people problems (at...