Move ship to anchorage during setup

Also fixed Merchantman - now prompt to discard from the blessing deck to
allow choice of plunder
Merge branch 'master' into test-Tyler