Use ng-options for binding to choice selects

This makes moving choices up and down a lot nicer.