new parameter args to build_win, passed to build
add NEWS
don't import deprecated text_content function
Merge remote-tracking branch 'hadley/master' into build_win-args

Conflicts:
	NEWS.md

Reconciled.
Merge remote-tracking branch 'hadley/master' into text_content
Merge pull request #428 from ncarchedi/master

Some updates to the default DESCRIPTION file
remove unused variable
extract function github_get_conn, supply (currently failing) tests
don't throw error when installing a pull request from GitHub using the format user/repo#pull
don't pass repo.zip as download name, adds confusion with the new repo syntax
install_github stores effective parameters (as found when parsing repo argument) in DESCRIPTION
add currently failing test for with_options
with_options works as expected
add NEWS item
enable union merge for NEWS.md file
Tweak readme
Export add_rstudio_project
Return correct path from check_r_cmd()

Previously, `check_r_cmd()` always returned a string indicating that the
check output was built in `tempdir()`, even when `check_dir` was
custom-set by the user.  Now the returned string indicates the correct
location in which the check output was built.
Add attribution for bug fix
Merge pull request #435 from krlmlr/news_union

enable union merge for NEWS.md file