Fixed bug in displayed of location in weather header
Pulled in upstream changes from github
Added ability to enter API key if not compiled into the app