Allow --network to be specified without a CIDR
Trying to syntax fix
Adjust to use network with -n or --network by default
Adjust to use password default of -pass or --password is specified
Use default prefix if -p or --prefix are used but unspecified
Merge pull request #125 from andymcc/sprint

Merged automatically by jenkins after successful gate test