Added aliases and option to include submodule without changes to the cli

Signed-off-by: Eric Malm <emalm@pivotallabs.com>