Merge pull request #73 from ChartKillers/kyle

Kyle
Fixed station name display
Merge pull request #74 from ChartKillers/KMSEdits

Fixed station name display
touch a whole lot of files
fix merge conflict
Merge branch 'JW'