overhauled requirejs setup (again)