revert a couple of changes to how concatenation is done to retain order of javascript files, and maintain parity with Bootstrap.