Add files immediately prior to those in ./app

Previously, when requiring files, they were appended to app.files. With this
change, requiring files will have them precede the app's files.

This works for multiple requires, the first requires get first priority.
Manually fix merge conflict