Revert "Merge remote-tracking branch 'origin/dev'"

This reverts commit 0ef4543c44cd204b407e062355247e0f56281828, reversing
changes made to 7b987a69f383e05f02d17ff6edaada65c3930491.

 Changes to be committed:
   (use "git reset HEAD <file>..." to unstage)

	modified:   conf/.gitignore
	deleted:    conf/default_regexes.txt
	modified:   conf/jonnyboys_my.cnf
	deleted:    scripts/reactivate_regexes.sh
	deleted:    ugo/automake.php
	deleted:    ugo/automake_threaded.php
	deleted:    ugo/finish_postproc.php
	deleted:    ugo/makenzb.php
	deleted:    ugo/makenzb_threaded.php
	deleted:    ugo/misc_sorter3.php
	deleted:    ugo/misc_sorter_cleanup.php
	deleted:    ugo/misc_sorter_threaded.php
	deleted:    ugo/postproc.php
	deleted:    ugo/postproc_threaded.php#	deleted:    ugo/update_binaries_threaded.php