updated requirejs for proper file-joining