Merge pull request #619 from nZEDb/master

Reverting all previous changes except bug fix
fixed bug in threaded import
put back most of the changes
really fixed threaded import
improved postprocessing query
remove duplicate echo
cleanup before starting new branch
Merge branch 'dehash_fix_2' of https://github.com/bfincher/nZEDb into bfincher-dehash_fix_2

Conflicts:
	misc/testing/Dev_testing/nzbx_ws_hashdecrypt_loop.php
fixed typos
tweaks to tmux
cleanup echos
updated decrypt hashes
typo
added echo to decrypt
Merge pull request #622 from nZEDb/dev

Many changes, look at dev commit log
Merge branch 'master' into brian

Conflicts:
	misc/update_scripts/nzbx_ws_hashdecrypt.php