Merge branch 'master' of https://github.com/ewhal/nyaa into captchas

.travis.yml

@@ -2,7 +2,6 @@ language: go
 go:
 - 1.x
 install:
-- sudo apt-get install -y cross-gcc-dev cross-binutils 
 - go get github.com/gorilla/feeds
 - go get github.com/gorilla/mux
 - go get github.com/mattn/go-sqlite3
@@ -15,11 +14,14 @@ install:
 - go get golang.org/x/crypto/bcrypt
 - go get github.com/nicksnyder/go-i18n/i18n
 - go get github.com/dchest/captcha
-- go build
-
-script:
-- go get github.com/mitchellh/gox
+- go get github.com/microcosm-cc/bluemonday
 - go get github.com/tcnksm/ghr
 - go get github.com/axw/gocov/gocov
-- gox -output "dist/{{.OS}}_{{.Arch}}_{{.Dir}}"
+- go get github.com/karalabe/xgo
+- mkdir dist
+
+script:
+- go build
+- cd dist
+- xgo github.com/ewhal/nyaa
 - ghr --username ewhal --token $GITHUB_TOKEN --replace --prerelease --debug pre-release dist/