Update OMs
Geomancy is viable
Merge pull request #1301 from ascriptmaster/geomancy

Geomancy is viable
Aromatherapy triggers Sap Sipper
Merge pull request #1300 from ascriptmaster/aromasipper

Aromatherapy triggers Sap Sipper
Merge remote-tracking branch 'upstream/master'

Conflicts:
	config/commands.js
	config/formats.js