Only deploy builds to s3 when commit has tag s3
Only deploy built binary to s3
Merge branch 'master' of github.com:mavant/my-dwm

Conflicts:
	.travis.yml
Fixing bad merge