updated max nsims to 6000
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
added .onAttach so mode report and three in parallel by default
add fritillary demo