use --org, -r in token encrypt

Author: btovar

.travis.yml

@@ -36,4 +36,4 @@ deploy:
     repo: cooperative-computing-lab/cctools
     tags: true
   api-key:
-    secure: vUPY+v2VM8V3834MavH+F2qr/V2er75KdqcxBg/FQ0NVyX+M4fAgycylP0qTm/iUN/ElUp8PXIBrCqUT2aZEo0C+/vwr1bXCoC+P3LlxtnEpUoIoW+b9lmlIXaHovjtto+gjc/zACdnNGfGU8YIijq0w19QvH/ctn/qvCEIjL8fJcJcL7iOGFLG6r1fr5fPZxZgurk7ibkXVI+ywBIvH70ah0HxVB0W8xP3FmDJz6zVmm8I78NjYHxuxSkNgQ8vdsuCOI5YZrQGbgSqlP4j7h5y6fMqOh8HMgRW3niU/dxPJQM9Bo/lGSFQX8FBbdLYYLOgWVaj++2PKwGfgTswMlHAyKgQPe+PlMnRST4g5ukSRQKvNd2bZnScXN/jU95UxnfjdKpa5HoGE/LvG4xUA4wsV4gW4blSMKbbLQU0wtS/Ca2N7Ak8aEwzMF3g0KkOV4LTuvo9ygjmWKN5uUNWAgugy8mrKmYHe8xd/ZuTlILR0N2VU1SD+X2gJPXha5l5QNdaw4Hz1OfOSlYHOfyj9wHBFfeYcHFAIUgerB2Sc0OJ6Vpr00zNUQ6dRcksEIcw+om0RX5rWeobU82q88vTcW29G1WtsTQSEoZBNtJoIh9wwII4jF7W2sv+Cv+sewKZJBQ7nlkVlPYQMnngH3ECIPdzm75gwmnMQHBMAaWWteto=
+    secure: N2shk/iZkkpHC8pRZLKaVr/hJKfc0QzGwTwkvGLdLE0HvlMP/hI8AXuxB/qAIjFU1cw+Mx4Ke96VysrBzfPDUEsw8LT+yNYtLSmFlMbwD8WKpRRrwEdx49KdmOTw9mt1utv7+yEWB5iRMztS9I7Vr5eTgtWmLG/iHGJGjJPGVc8=