Merge remote-tracking branch 'origin/master' into feature/boost-simd

Author: kevinushey

.travis.yml

@@ -4,9 +4,7 @@ before_install:
   - curl -OL http://raw.github.com/craigcitro/r-travis/master/scripts/travis-tool.sh
   - chmod 755 ./travis-tool.sh
   - ./travis-tool.sh bootstrap
-  #- ./travis-tool.sh github_package hadley/testthat
-  - ./travis-tool.sh github_package RcppCore/Rcpp
-  - ./travis-tool.sh install_aptget r-cran-runit
+  - ./travis-tool.sh install_aptget r-cran-rcpp r-cran-bh r-cran-runit
 
 script: 
   - R CMD INSTALL .