Make the scons build files simpler and easier to understand and maintain.
Merge pull request #154 from ninneman/devel

Make the scons build files simpler and easier to understand and maintain...