removed Mac temporary preview file
Merge pull request #29 from mcandre/master

Removed .DS_Store, a Mac temporary preview file
Updated expected geonameID for LONDON_UK from 2643743 to 2643741, existing test was breaking the build
Merge pull request #30 from veltman/master

Changed geonameID for London to fix build-breaking test
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.gitignore