diff --git a/.appveyor.yml b/.appveyor.yml
new file mode 100644
index 0000000..d1fd5c9
--- /dev/null
+++ b/.appveyor.yml
@@ -0,0 +1,31 @@
+# Documentation: https://github.com/JuliaCI/Appveyor.jl
+environment:
+  matrix:
+  - julia_version: 1
+  - julia_version: nightly
+platform:
+  - x86
+  - x64
+matrix:
+  allow_failures:
+    - julia_version: nightly
+branches:
+  only:
+    - master
+    - /release-.*/
+notifications:
+  - provider: Email
+    on_build_success: false
+    on_build_failure: false
+    on_build_status_changed: true
+install:
+  - ps: iex ((new-object net.webclient).DownloadString("https://raw.githubusercontent.com/JuliaCI/Appveyor.jl/version-1/bin/install.ps1"))
+build_script:
+  - echo "%JL_BUILD_SCRIPT%"
+  - C:\julia\bin\julia -e "%JL_BUILD_SCRIPT%"
+test_script:
+  - echo "%JL_TEST_SCRIPT%"
+  - C:\julia\bin\julia -e "%JL_TEST_SCRIPT%"
+on_success:
+  - echo "%JL_CODECOV_SCRIPT%"
+  - C:\julia\bin\julia -e "%JL_CODECOV_SCRIPT%"
diff --git a/.travis.yml b/.travis.yml
index a967b45..6025d00 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,27 +3,14 @@ language: julia
 os:
   - linux
   - osx
-sudo: required
 julia:
-  - 1.0
-  - 1.2
+  - 1
   - nightly
 matrix:
   allow_failures:
     - julia: nightly
   fast_finish: true
-branches:
-  only:
-    master
 notifications:
-  email: false
-script:
- - if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
- - julia --color=yes ci_setup.jl
- - julia --color=yes --code-coverage test/runtests.jl
+  email: true
 after_success:
-  - julia -e 'VERSION >= v"0.7.0-" && using Pkg;
-        VERSION < v"0.7.0-" && cd(Pkg.dir("PortAudio"));
-        Pkg.add("Coverage");
-        using Coverage;
-        Codecov.submit(process_folder())'
+  - julia -e 'using Pkg; Pkg.add("Coverage"); using Coverage; Codecov.submit(process_folder())'
diff --git a/README.md b/README.md
index 467beef..7d9ee9b 100644
--- a/README.md
+++ b/README.md
@@ -4,8 +4,6 @@ PortAudio.jl
 [![Build Status](https://travis-ci.org/JuliaAudio/PortAudio.jl.svg?branch=master)](https://travis-ci.org/JuliaAudio/PortAudio.jl)
 [![Build status](https://ci.appveyor.com/api/projects/status/6x1ha7uvrnel060g/branch/master?svg=true)](https://ci.appveyor.com/project/ssfrr/portaudio-jl/branch/master)
 
-**NOTE: PortAudio.jl master currently requires both SampledSignals and RingBuffers to be on master as well**
-
 PortAudio.jl is a wrapper for [libportaudio](http://www.portaudio.com/), which gives cross-platform access to audio devices. It is compatible with the types defined in [SampledSignals.jl](https://github.com/JuliaAudio/SampledSignals.jl). It provides a `PortAudioStream` type, which can be read from and written to.
 
 ## Opening a stream
diff --git a/appveyor.yml b/appveyor.yml
deleted file mode 100644
index f7717b9..0000000
--- a/appveyor.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-environment:
-  matrix:
-    - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x86/1.0/julia-1.0-latest-win32.exe"
-    - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/1.0/julia-1.0-latest-win64.exe"
-
-matrix:
-  allow_failures:
-    # currently failing on 1.0 until https://github.com/JuliaLang/METADATA.jl/pull/16370 is merged
-    - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/1.0/julia-1.0-latest-win64.exe"
-
-notifications:
-  - provider: Email
-    on_build_success: false
-    on_build_failure: false
-    on_build_status_changed: false
-
-# only build master and PRs
-branches:
-  only:
-    - master
-
-install:
-  - ps: "[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType]::Tls12"
-# Download most recent Julia Windows binary
-  - ps: (new-object net.webclient).DownloadFile(
-        $env:JULIA_URL,
-        "C:\projects\julia-binary.exe")
-# Run installer silently, output to C:\projects\julia
-  - C:\projects\julia-binary.exe /S /D=C:\projects\julia
-
-build_script:
-# Need to convert from shallow to complete for Pkg.clone to work
-  - IF EXIST .git\shallow (git fetch --unshallow)
-  - C:\projects\julia\bin\julia --color=yes ci_setup.jl
-
-test_script:
-  # - C:\projects\julia\bin\julia --check-bounds=yes -e "Pkg.test(\"SampledSignals\")"
-  - C:\projects\julia\bin\julia --color=yes --code-coverage --check-bounds=yes test/runtests.jl
diff --git a/src/PortAudio.jl b/src/PortAudio.jl
index f00a902..17abe05 100644
--- a/src/PortAudio.jl
+++ b/src/PortAudio.jl
@@ -1,13 +1,6 @@
 module PortAudio
 
 using libportaudio_jll, Libdl, SampledSignals, RingBuffers
-#=
-using Compat
-using Compat: undef, fetch, @compat
-using Compat.LinearAlgebra: transpose!
-using Compat: stdout
-using Compat.Sys: iswindows
-=#
 
 import Base: eltype, show
 import Base: close, isopen