Rproj changes: don't roxygenize; use --as-cran for test
Merge pull request #328 from rstudio/feature/rproj-changes

Rproj changes: don't roxygenize; use --as-cran for test
Merge remote-tracking branch 'origin/master' into feature/bootstrap-layout