cd management / fixes
misc options
Merge remote-tracking branch 'origin/master'

Conflicts:
	Rotations/Warrior/Arms.lua