Merge pull request #1 from thomasgwatson/google

Google
Merge branch 'master' of https://github.com/thomasgwatson/mapwarper into google