Merge branch 'master' into dev

.gitignore

@@ -32,3 +32,4 @@ vignettes/*.pdf
 *.utf8.md
 *.knit.md
 .Rproj.user
+

README.md

@@ -1,6 +1,8 @@
+[![Build Status](https://travis-ci.org/wibeasley/r-package-skeleton.svg?branch=master)](https://travis-ci.org/wibeasley/r-package-skeleton)
+
 # r-package-skeleton
 
-This is for a SCUG class scheduled for two 1-hour SCUG meetings.
+This is for a 2017 SCUG class scheduled for two 1-hour SCUG meetings.
 
 
 Creating a minimal R package: initializing package skeleton

documentation-for-developers/initializing-package.md

@@ -109,7 +109,7 @@ Travis-CI tests your package on different Linux environments.  It starts with a
 Further details:
 * The first test will take Travis a long time (maybe 20 min?) because it's caching a lot of the environment setup.  Once cached, a minimal package will take just a few minutes each push.
 * Only the last commit of a push is tested.
-* Travis-CI can to a lot of things beyond this simple scenario.  There's a lot to read.
+* Travis-CI can do a lot of things beyond this simple scenario.  There's a lot to read.
     * https://travis-ci.org/getting_started
     * https://docs.travis-ci.com/user/languages/r/
 * Alternatively, use `devtools::use_travis()` and complete the extra fields.
@@ -127,7 +127,7 @@ AppVeyor tests your package on different Windows environments.  It starts with a
 Further details:
 * The first test will take AppVeyor a long time (but not as long as Travis) because it's caching a lot of the environment setup.  Once cached, a minimal package will take just a few minutes each push.
 * Only the last commit of a push is tested.
-* AppVeyor can to a lot of things beyond this simple scenario.  There's a lot to read.
+* AppVeyor can do a lot of things beyond this simple scenario.  There's a lot to read.
     * https://www.appveyor.com/docs/
     * https://github.com/krlmlr/r-appveyor
 * Alternatively, use `devtools::use_appveyor()` and complete the extra fields.