Merge pull request #1 from mygu/master

merge latest code from mingyu's repo
Update setup.py
Update ip_on_map.html
Merge pull request #2 from zhiwehu/master

updated setup and template