Refactored ability resets - rely on ability list

closes #36