cleaned up threaded pp, add 2 minute kill for threaded pp in tmux
Merge branch 'dev' of github.com:nZEDb/nZEDb into dev
replaced spaces with tabs