fix row_number. closes #227
Merge branch 'master' of https://github.com/hadley/dplyr