Added 1.7.2 blocks and items
New 1.7 factories and rebalancing

Heavy conflicts in config.yml, backported by pruby

Conflicts:

	config.yml
Merge pull request #5 from pruby/backport_17_factories

Backport 17 factories