Code reorg, no functional changes

- just some code cleanup. Removed the contoller 'upload' and replaced
with 'image' and fixed some hard-codes, such as thumb-sizes
Merge branch 'master' of https://github.com/cdechery/xumb