Minor bug fixes

This puts the loader code back into the modernizr hook (so other modules that eventually use it will keep all the code in a single request, and not have to do multiple loader files)

Also corrects some things that happened in the kurfuffle... (is that how spell it?