Concatenated programs less hacky, main works.
Merge pull request #558 from herby/requirejs-wip

Main works, less hacky concatenations produced