windows sync
windows sync and new survreg-calling facility
Merge branch 'master' of https://github.com/chjackson/flexsurv-dev

Conflicts:
	R/flexsurvreg.R
add