Binstar stuff

I'll just check for both in the regex.