1.1.5 eval=False for pfCircular in vignette
merge

Merge branch 'master' of http://github.com/paleofire/paleofire

Conflicts:
	R/pfCircular.R