Removed parseConf() that was going to be used for XML
Removed more code that was going to be used for XML
getMaster() Now returns a String array of masters
Javadoc comment for getWundergroundkey (API Key)
Merge remote-tracking branch 'origin/master'

Merging