Refactored SConstruct to use mixed html layout for inclusion in puppet.
Grouped scons build calls.