Flip-flop a few aliases for more consistent "--uniq" output

Before:

```console
$ bashbrew list --uniq <(./generate-stackbrew-library.sh)
63:4.6.1-apache
63:4.6.1-fpm
63:4.6.1-php7.0
63:4.6.1-php7.0-fpm
```

After:

```console
$ bashbrew list --uniq <(./generate-stackbrew-library.sh)
63:4.6.1-apache
63:4.6.1-fpm
63:4.6.1-php7.0-apache
63:4.6.1-php7.0-fpm
```

Author: tianon

generate-stackbrew-library.sh

@@ -87,14 +87,15 @@ for phpVersion in "${phpVersions[@]}"; do
 				fullAliases+=( "${versionAliases[@]}" )
 			fi
 		fi
-		if [ "$variant" = "$defaultVariant" ]; then
-			fullAliases+=( "${phpVersionAliases[@]}" )
-		fi
 
 		fullAliases+=(
 			"${phpVersionVariantAliases[@]}"
 		)
 
+		if [ "$variant" = "$defaultVariant" ]; then
+			fullAliases+=( "${phpVersionAliases[@]}" )
+		fi
+
 		echo
 		cat <<-EOE
 			Tags: $(join ', ' "${fullAliases[@]}")