Removed refs to window.angular and instead ref'd local variable; window....

fix($http,$location): fix undefined global after use of noConflict()

The angular global is not available after using noConflict() so local copy must be used.