Some more moksha cli improvements
Some more moksha cli improvements

ralphbean/moksha,lmacken/moksha,pombredanne/moksha,mokshaproject/moksha,lmacken/moksha,ralphbean/moksha,mokshaproject/moksha,mokshaproject/moksha,pombredanne/moksha,pombredanne/moksha,mokshaproject/moksha,ralphbean/moksha,pombredanne/moksha,lmacken/moksha