properly included urls, updated tests
upload_to is useless in this context
Merge branch 'imagefield'