allow choices to be a list of (key, label) tuples as well
Merge pull request #63 from dannyroberts/choices

allow choices to be a list of (key, label) tuples as well