Refactored weather file info. Fixed weather types array. Fixed more line
breaks.
Merge remote-tracking branch 'origin/master'