added alternate backfill type
Merge branch 'dev' of github.com:nZEDb/nZEDb into dev

Conflicts:
	db/schema.sql
fixed mnerge issues
More additions.
fixed my bad
Merge branch 'dev' of https://github.com/nZEDb/nZEDb into dev
Merge branch 'dev' of https://github.com/nZEDb/nZEDb into dev
Perms.
Fix.
Merge pull request #129 from nZEDb/dev

Additions to tmux and category.php