concatenating and minifying javascript; correctly this time