Merge branch '2.1.x' into 2.2.x

Author: jeffscottbrown

scripts/Alias.groovy

@@ -22,18 +22,16 @@ target(default: 'Configures aliases for grails commands') {
      if (!params) {
          if (argsMap.list) {
              listAliases()
+         } else if(argsMap.delete) {
+             removeAlias()
          } else {
              println usage()
              exit 1
          }
          exit 0
      }
      if (params.size() == 1) {
-         if (argsMap.delete) {
-             removeAlias()
-         } else {
-             showAlias()
-         }
+         showAlias()
      } else {
          configureAlias()
      }