Merge branch 'NET-39/bash-reformat' into NET-39/nm-quick-refactor

# Conflicts:
#	scripts/nm-quick.sh

scripts/nm-quick.sh

@@ -42,7 +42,7 @@ usage() {
 	echo "  -e      if specified, will install netmaker EE"
 	echo "  -b      type of build; options:"
 	echo "          \"version\" - will install a specific version of Netmaker using remote git and dockerhub"
-	echo "          \"local\": - will install by cloning repo and and building images from git"
+	echo "          \"local\": - will install by cloning repo and building images from git"
 	echo "          \"branch\": - will install a specific branch using remote git and dockerhub"
 	echo "  -t      tag of build; if buildtype=version, tag=version. If builtype=branch or builtype=local, tag=branch"
 	echo "  -a      auto-build; skip prompts and use defaults, if none provided"