fix command line parsing for most recent nightlies
Merge branch 'master' of github.com:marcusklaas/rust-conway