Sort out branches so gopkg.in can make versioned import paths

[abh]

Let's sort out the branches so we can make a v1 of the current code and a v2 with a cleaned up API (and then maybe require libgeoip 1.5 there for issue #8 ).