Version bump
Merge branch 'master' of https://github.com/hadley/httr.git

Conflicts:
	NEWS