Fix for upstream #14 (glsldb hangs when debugging)
Flexible output.
Breaks and indents.
Merge master