updated max nsims to 6000
6000 max nsims

Merge branch 'b1.7' of https://github.com/joethorley/jaggernaut into b1.7

Conflicts:
	R/opts-jagr.r