Added habitat_configuration to bout picker and in populateMoveTracker