updated tmux to use threaded import script
Merge branch 'dev' of github.com:nZEDb/nZEDb into dev
added folnername to average
Merge branch 'master' of https://github.com/nZEDb/nZEDb into dev
added sorting to the folder threads in import_threaded.py
Fix issues with the shell script.
Merge branch 'dev' of https://github.com/nZEDb/nZEDb into dev
Merge pull request #67 from nZEDb/dev

Dev