Fixed a few issues raised by David Larlet, added documentation for upload_to callables, updated to patch cleanly against r7133
