- changed some parameter defaults - tested proxy settings - modified test harness
Merge branch 'master' of github.com:hrbrmstr/splashr # Conflicts: # R/docker.r