depending on Rcpp 0.11.0 (simpler Makevars, and less condition compiling)
Merge branch 'master' of https://github.com/hadley/dplyr