Support for repeatedly 'mixing up' a movelist before it is simulated
Merged conflicts
Moved more constants into config.py