Ensures callback placeholders are tested for and eventually replaced in data only when contentType is application/x-www-form-urlencoded and data is a string. Removes json to jsonp promotion when jsonp or jsonpCallback options are present. Uses new Deferred.always method to bind cleanUp function.

Merge branch 'jslint_function_in_loop' of https://github.com/timmywil/jquery into timmywil-jslint_function_in_loop

VML.type test was causing multiple test suite fails, fix attributes.js fail in IE6 where the val(String/Number) tests were interfering with the val(Function) tests

Followup to #8753. Modify new Event constructor signature to jQuery.event(type, props), which can be exploited by jQuery.event.trigger as well.

Conflicts:
	src/event.js

Merge branch 'master' of https://github.com/rjgotten/jquery into rjgotten-master. Also added in unit tests covering the case. Fixes #6180.

Conflicts:
	src/manipulation.js

Conflicts:
	src/offset.js

Conflicts:
	src/core.js
	src/css.js
	src/event.js

Merge branch 'fix-8790-quick-trigger' of https://github.com/dmethvin/jquery into dmethvin-fix-8790-quick-trigger

This reverts commit 1299e89d.

Conflicts:

	test/unit/css.js

Conflicts:
	test/unit/offset.js

Merge branch 'attr_remove_list_check' of https://github.com/timmywil/jquery into timmywil-attr_remove_list_check

Fixes unit/css.js test fail in Safari 5. support.js test was passing erroneously due to the body to which the div was attached having a width of 0

Bug fixes in queue.js: type in dequeue could be undefined which lead to a wrong data key, which would then have undesirable data left dangling on elements. Also adds missing semicolon in effects unit.