diff --git a/Makefile b/Makefile
index b85b96a..2de00fe 100644
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,21 @@
+base_dir = `pwd`
+gopath = "$(base_dir)/vendor:$(GOPATH)"
+
 all: fmt deps test
 	@echo "Building."
 	@mkdir -p bin/
-	go build -v -o bin/gosync .
+	@env GOPATH=$(gopath) go build -v -o bin/gosync .
+clean:
+	@echo "Cleaning."
+	@rm -rf bin pkg vendor/pkg
 deps:
 	@echo "Getting Dependencies."
-	go get -d -v ./...
-test: deps
-	@echo "Testing."
-	go test ./...
+	@env GOPATH=$(gopath) go get -d -v ./...
 fmt:
 	@echo "Formatting."
 	gofmt -w .
+test: deps
+	@echo "Testing."
+	@env GOPATH=$(gopath) go test ./gosync/...
+
+.PHONY: all clean deps fmt test
diff --git a/main.go b/main.go
index 3247398..ce0b653 100644
--- a/main.go
+++ b/main.go
@@ -65,7 +65,7 @@ func main() {
 
 func validateArgs(c *cli.Context) error {
 	if len(c.Args()) != 2 {
-		return fmt.Errorf("S3 URL and local directory required.")
+		return fmt.Errorf("Source and target required.")
 	}
 	return nil
 }
diff --git a/vendor/src/github.com/cihub/seelog b/vendor/src/github.com/cihub/seelog
new file mode 160000
index 0000000..d233b77
--- /dev/null
+++ b/vendor/src/github.com/cihub/seelog
@@ -0,0 +1 @@
+Subproject commit d233b770e46b3ec2a99056fa5415f34c9c61cd8d
diff --git a/vendor/src/github.com/codegangsta/cli b/vendor/src/github.com/codegangsta/cli
new file mode 160000
index 0000000..7381bc4
--- /dev/null
+++ b/vendor/src/github.com/codegangsta/cli
@@ -0,0 +1 @@
+Subproject commit 7381bc4e62942763475703c7edd405f1e42adf4f
diff --git a/vendor/src/github.com/mitchellh/goamz b/vendor/src/github.com/mitchellh/goamz
new file mode 160000
index 0000000..6f49d3d
--- /dev/null
+++ b/vendor/src/github.com/mitchellh/goamz
@@ -0,0 +1 @@
+Subproject commit 6f49d3df51d97907329f4caa251a5c1fb324410a
diff --git a/vendor/src/github.com/motain/gocheck b/vendor/src/github.com/motain/gocheck
new file mode 160000
index 0000000..9beb271
--- /dev/null
+++ b/vendor/src/github.com/motain/gocheck
@@ -0,0 +1 @@
+Subproject commit 9beb271d26e640863a5bf4a3c5ea40ccdd466b84
diff --git a/vendor/src/github.com/vaughan0/go-ini b/vendor/src/github.com/vaughan0/go-ini
new file mode 160000
index 0000000..a98ad7e
--- /dev/null
+++ b/vendor/src/github.com/vaughan0/go-ini
@@ -0,0 +1 @@
+Subproject commit a98ad7ee00ec53921f08832bc06ecf7fd600e6a1