test
Reconcile

Merge branch 'master' of github.com:jknowles/maintainr

Conflicts:
	.Rbuildignore
	R/pkg_list.R
	R/write_profile.R