refactoring to clean up my mess
Merge branch 'master' of github.com:SeattleTestbed/ipinfo