Merge branch 'master' of github.com:GigaOM/go-recurly into flock

sync