Optimize by default and use flags to disable
Merge pull request #323 from garyb/optimize-by-default

Optimize by default and use flags to disable