put untags in the database
use upload_tmp_dir as temp place, see #297

We changed a line like this some time ago in upload/main
Merge pull request #322 from HungryFeline/patch-3

use upload_tmp_dir as temp place, see #297
untag table titles
remove debugging logs from js
ban from mass delete
have Tag::resolve_list always take an array
resolve_list -> resolve_aliases, to better describe what it actually does
resolve negative aliases
only sanitise when saving tags - when searching, '*' is important
hide https variable warning
save cached config when saving database config, fixes #311
have setup 'Help' link link to github wiki, fixes #303
Merge branch 'master' of https://github.com/shish/shimmie2
show when a ban was added, fixes #250
Fix incorrect DataUploadEvent creation, triggering an assertion failure

I guess this one slipped through the cracks when $user was made global.
readdir is not guaranteed to be in order

readdir's ordering is filesystem-dependent. On many systems, that means it
might as well be random. People uploading archives will reasonably expect the
files to appear in alphabetical order, so we should make sure they do.
Merge pull request #326 from Madoushi90/archive_fixes

handle_archive extension fixes
core-image -> core_image, for elasticsearch's sake
log args