update setup
Merge branch 'master' of github.com:mygu/django-googlemap