Removing generated code on make clean.
Merge branch 'develop'
Removing development compiler options from master branch (no merges from this point should come out of master).