geo and countrycode stuff
Merge branch 'master' of github.com:NLNOG/ring-puppet