Merge branch 'pruned_master' into new_master

Conflicts:
	lib/config.sh
	lib/functions.sh
	lib/global-transforms.mog