Use station.short_name in choice list.
Merge remote-tracking branch 'upstream/master'
Clean up unused method.
Merge pull request #28 from rhayes-cida/master

Use station.short_name for display in choice list.