Sync with zach

Basically, just syncing up our 2 repos, and making sure the travis CI logo on both of them points to the unit tests for the master repo (topepo/caret).