renamed cli parameters --plugin => --service, --peer => --machine and added short hands as well