diff --git a/.gitignore b/.gitignore
index 99eaedeb..b6ceb313 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,8 +27,12 @@ coverage*.out
 
 *.pyc
 
-_vendor/
+vendor/
+xc-out/
+root/
 
 gen
 man/aptly.1.html
-man/aptly.1.ronn
\ No newline at end of file
+man/aptly.1.ronn
+
+.goxc.local.json
diff --git a/.goxc.json b/.goxc.json
index 80a7a409..5eba5439 100644
--- a/.goxc.json
+++ b/.goxc.json
@@ -2,10 +2,12 @@
 	"AppName": "aptly",
 	"ArtifactsDest": "xc-out/",
 	"TasksExclude": [
-		"rmbin"
+		"rmbin",
+		"go-test",
+		"go-vet"
 	],
     "TasksAppend": [
-        "bintray"
+		"bintray"
     ],
     "TaskSettings": {
         "deb": {
@@ -33,6 +35,6 @@
     },
 	"Arch": "386 amd64",
 	"Os": "linux darwin freebsd",
-	"MainDirsExclude": "man,_vendor",
+	"MainDirsExclude": "man,vendor",
 	"ConfigVersion": "0.9"
-}
\ No newline at end of file
+}
diff --git a/.travis.yml b/.travis.yml
index e074824f..f1546b69 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,8 +3,8 @@ sudo: false
 language: go
 
 go:
-  - 1.5
   - 1.6
+  - 1.7
   - tip
 
 addons:
diff --git a/Makefile b/Makefile
index 6656c044..bae1c347 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 GOVERSION=$(shell go version | awk '{print $$3;}')
 PACKAGES=context database deb files http query swift s3 utils
 ALL_PACKAGES=api aptly context cmd console database deb files http query swift s3 utils
-BINPATH=$(abspath ./_vendor/bin)
+BINPATH=$(abspath ./vendor/bin)
 GOM_ENVIRONMENT=-test
 PYTHON?=python
 
@@ -65,7 +65,7 @@ src-package:
 	cd aptly-$(VERSION)/src/github.com/smira/ && git clone https://github.com/smira/aptly && cd aptly && git checkout v$(VERSION)
 	cd aptly-$(VERSION)/src/github.com/smira/aptly && gom -production install
 	cd aptly-$(VERSION)/src/github.com/smira/aptly && find . \( -name .git -o -name .bzr -o -name .hg \) -print | xargs rm -rf
-	rm -rf aptly-$(VERSION)/src/github.com/smira/aptly/_vendor/{pkg,bin}
+	rm -rf aptly-$(VERSION)/src/github.com/smira/aptly/vendor/{pkg,bin}
 	mkdir -p aptly-$(VERSION)/bash_completion.d
 	(cd aptly-$(VERSION)/bash_completion.d && wget https://raw.github.com/aptly-dev/aptly-bash-completion/$(VERSION)/aptly)
 	tar cyf aptly-$(VERSION)-src.tar.bz2 aptly-$(VERSION)
diff --git a/README.rst b/README.rst
index 8c8becfb..6062315b 100644
--- a/README.rst
+++ b/README.rst
@@ -64,7 +64,7 @@ If you would like to use nightly builds (unstable), please use following reposit
 
 Binary executables (depends almost only on libc) are available for download from `Bintray <http://dl.bintray.com/smira/aptly/>`_.
 
-If you have Go environment set up, you can build aptly from source by running (go 1.4+ required)::
+If you have Go environment set up, you can build aptly from source by running (go 1.6+ required)::
 
     go get -u github.com/mattn/gom
     mkdir -p $GOPATH/src/github.com/smira/aptly