Refactor turn management

Refactor turn management, stub out more turn actions, make code more
consistent throughout game
Update battle model