Make the upload calbacks more easily overridable in the image block
pass the arguments through the success and failure callbacks - uploader
Merge pull request #186 from madebymany/improve-image-block--allow-upload-callback-override

Make the upload calbacks more easily overridable in the image block
Merge branch 'master' into 168-less-aggresive-html-stripping

Conflicts:
	sir-trevor.min.js