BETA: HashMap caching for thumbnails
Merge branch 'master' into derek
Hashmap, caching images, yay!
icon!