dbi updates
Merge branch 'master' of https://github.com/hadley/dplyr

Conflicts:
	R/translate-sql.r