diff --git a/assembly/pom.xml b/assembly/pom.xml
index 64f3c4a..78e5573 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -1,320 +1,320 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (C) 2012, the original authors
-  ~
-  ~  Licensed under the Apache License, Version 2.0 (the "License");
-  ~  you may not use this file except in compliance with the License.
-  ~  You may obtain a copy of the License at
-  ~
-  ~  http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~  Unless required by applicable law or agreed to in writing, software
-  ~  distributed under the License is distributed on an "AS IS" BASIS,
-  ~  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~  See the License for the specific language governing permissions and
-  ~  limitations under the License.
-  -->
+~ Copyright (C) 2012, the original authors
+~
+~  Licensed under the Apache License, Version 2.0 (the "License");
+~  you may not use this file except in compliance with the License.
+~  You may obtain a copy of the License at
+~
+~  http://www.apache.org/licenses/LICENSE-2.0
+~
+~  Unless required by applicable law or agreed to in writing, software
+~  distributed under the License is distributed on an "AS IS" BASIS,
+~  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~  See the License for the specific language governing permissions and
+~  limitations under the License.
+-->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>jclouds-cli-pom</artifactId>
-        <groupId>org.jclouds.cli</groupId>
-        <version>1.7.0-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
+  <parent>
+    <artifactId>jclouds-cli-pom</artifactId>
     <groupId>org.jclouds.cli</groupId>
-    <artifactId>jclouds-cli</artifactId>
     <version>1.7.0-SNAPSHOT</version>
-    <name>jclouds :: cli :: assembly</name>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>org.jclouds.cli</groupId>
+  <artifactId>jclouds-cli</artifactId>
+  <version>1.7.0-SNAPSHOT</version>
+  <name>jclouds :: cli :: assembly</name>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.jclouds.cli</groupId>
-            <artifactId>branding</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.jclouds.cli</groupId>
-            <artifactId>runner</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.karaf</groupId>
-            <artifactId>apache-karaf</artifactId>
-            <version>${karaf.version}</version>
-            <type>tar.gz</type>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.karaf</groupId>
-            <artifactId>apache-karaf</artifactId>
-            <version>${karaf.version}</version>
-            <type>zip</type>
-        </dependency>
+  <dependencies>
+    <dependency>
+      <groupId>org.jclouds.cli</groupId>
+      <artifactId>branding</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.jclouds.cli</groupId>
+      <artifactId>runner</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.karaf</groupId>
+      <artifactId>apache-karaf</artifactId>
+      <version>${karaf.version}</version>
+      <type>tar.gz</type>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.karaf</groupId>
+      <artifactId>apache-karaf</artifactId>
+      <version>${karaf.version}</version>
+      <type>zip</type>
+    </dependency>
 
-        <!-- External Logging Dependencies -->
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-            <version>${slf4j.version}</version>
-        </dependency>
+    <!-- External Logging Dependencies -->
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>${slf4j.version}</version>
+    </dependency>
 
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
-            <version>${slf4j.version}</version>
-        </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
+      <version>${slf4j.version}</version>
+    </dependency>
 
-        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-            <version>${log4j.version}</version>
-        </dependency>
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <version>${log4j.version}</version>
+    </dependency>
 
-    </dependencies>
+  </dependencies>
 
-    <build>
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>false</filtering>
-            </resource>
-            <resource>
-                <directory>src/main/filtered-resources</directory>
-                <includes>
-                    <include>**/*</include>
-                </includes>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-resources-plugin</artifactId>
-                <version>${maven-resources-plugin.version}</version>
-                <configuration>
-                    <useDefaultDelimiters>false</useDefaultDelimiters>
-                    <delimiters>
-                        <delimiter>${*}</delimiter>
-                    </delimiters>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>filter</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>resources</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>unpack-unix</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>unpack</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>org.apache.karaf</groupId>
-                                    <artifactId>apache-karaf</artifactId>
-                                    <version>${karaf.version}</version>
-                                    <classifier>minimal</classifier>
-                                    <type>tar.gz</type>
-                                    <outputDirectory>target/dependencies/unix</outputDirectory>
-                                </artifactItem>
-                            </artifactItems>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>unpack-win</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>unpack</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>org.apache.karaf</groupId>
-                                    <artifactId>apache-karaf</artifactId>
-                                    <version>${karaf.version}</version>
-                                    <classifier>minimal</classifier>
-                                    <type>zip</type>
-                                    <outputDirectory>target/dependencies/win</outputDirectory>
-                                </artifactItem>
-                            </artifactItems>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.karaf.tooling</groupId>
-                <artifactId>features-maven-plugin</artifactId>
-                <version>${karaf.version}</version>
-                <executions>
-                    <execution>
-                        <id>add-features-to-repo</id>
-                        <phase>compile</phase>
-                        <goals>
-                            <goal>add-features-to-repo</goal>
-                        </goals>
-                        <configuration>
-                            <descriptors>
-                                <descriptor>
-                                    mvn:org.apache.karaf.assemblies.features/standard/${karaf.version}/xml/features
-                                </descriptor>
-                                <descriptor>
-                                    mvn:org.jclouds.karaf/jclouds-karaf/${jclouds.karaf.version}/xml/features
-                                </descriptor>
-                            </descriptors>
-                            <features>
-                                <feature>config</feature>
-                                <feature>jclouds-guice</feature>
-                                <feature>jclouds</feature>
-                                <feature>jclouds-compute</feature>
-                                <feature>jclouds-nodepool</feature>
-                                <feature>jclouds-api-filesystem</feature>
-                                <feature>jclouds-api-elasticstack</feature>
-                                <feature>jclouds-api-vcloud</feature>
-                                <feature>jclouds-api-byon</feature>
-                                <feature>jclouds-api-swift</feature>
-                                <feature>jclouds-api-openstack-nova</feature>
-                                <feature>jclouds-api-openstack-cinder</feature>
-                                <feature>jclouds-api-s3</feature>
-                                <feature>jclouds-api-ec2</feature>
-                                <feature>jclouds-api-cloudstack</feature>
-                                <feature>jclouds-api-rackspace-cloudidentity</feature>
-                                <feature>jclouds-api-chef</feature>
-                                <feature>jclouds-driver-jsch</feature>
-                                <feature>jclouds-driver-sshj</feature>
-                                <feature>jclouds-driver-slf4j</feature>
-                                <feature>jclouds-driver-log4j</feature>
-                                <feature>jclouds-driver-bouncycastle</feature>
-                                <feature>jclouds-aws-cloudwatch</feature>
-                                <feature>jclouds-aws-ec2</feature>
-                                <feature>jclouds-aws-s3</feature>
-                                <feature>jclouds-azureblob</feature>
-                                <feature>jclouds-bluelock-vcloud-zone01</feature>
-                                <feature>jclouds-cloudfiles-uk</feature>
-                                <feature>jclouds-cloudfiles-us</feature>
-                                <feature>jclouds-rackspace-cloudloadbalancers-us</feature>
-                                <feature>jclouds-rackspace-cloudloadbalancers-uk</feature>
-                                <feature>jclouds-cloudonestorage</feature>
-                                <feature>jclouds-cloudserver-uk</feature>
-                                <feature>jclouds-cloudserver-us</feature>
-                                <feature>jclouds-rackspace-cloudservers-us</feature>
-                                <feature>jclouds-rackspace-cloudservers-uk</feature>
-                                <feature>jclouds-cloudsigma-zrh</feature>
-                                <feature>jclouds-cloudsigma-lvs</feature>
-                                <feature>jclouds-elastichosts-lon-b</feature>
-                                <feature>jclouds-elastichosts-lon-p</feature>
-                                <feature>jclouds-elastichosts-sat-p</feature>
-                                <feature>jclouds-elastichosts-lax-p</feature>
-                                <feature>jclouds-elastichosts-tor-p</feature>
-                                <feature>jclouds-gogrid</feature>
-                                <feature>jclouds-go2cloud-jhb1</feature>
-                                <feature>jclouds-greenhousedata-element-vcloud</feature>
-                                <feature>jclouds-hpcloud-objectstorage</feature>
-                                <feature>jclouds-hpcloud-compute</feature>
-                                <feature>jclouds-trystack-nova</feature>
-                                <feature>jclouds-ninefold-storage</feature>
-                                <feature>jclouds-ninefold-compute</feature>
-                                <feature>jclouds-openhosting-east1</feature>
-                                <feature>jclouds-serverlove-z1-man</feature>
-                                <feature>jclouds-skalicloud-sdg-my</feature>
-                                <feature>jclouds-softlayer</feature>
-                                <feature>jclouds-synaptic-storage</feature>
-                                <feature>jclouds-stratogen-vcloud-mycloud</feature>
-                                <feature>jclouds-trmk-ecloud</feature>
-                                <feature>jclouds-trystack-nova</feature>
-                                <feature>jclouds-trmk-vcloudexpress</feature>
-                                <feature>jclouds-joyent-cloudapi</feature>
-                                <feature>jclouds-joyent</feature>
-                                <feature>jclouds-greenqloud-storage</feature>
-                                <feature>jclouds-greenqloud-compute</feature>
-                                <feature>jclouds-services</feature>
-                                <feature>jclouds-commands</feature>
-                                <feature>jclouds-chef</feature>
-                                <feature>jclouds-url-handler</feature>
-                            </features>
-                            <includeMvnBasedDescriptors>true</includeMvnBasedDescriptors>
-                            <repository>target/features-repo</repository>
-                        </configuration>
-                        <inherited>false</inherited>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <version>${maven-antrun-plugin.version}</version>
-                <executions>
-                    <execution>
-                        <phase>prepare-package</phase>
-                        <configuration>
-                            <tasks>
-                                <replace token="#!/bin/bash" value="#!/bin/sh"
-                                         dir="target/dependencies/unix/apache-karaf-${karaf.version}/bin">
-                                    <include name="*"/>
-                                </replace>
-                                <replaceregexp file="target/dependencies/unix/apache-karaf-${karaf.version}/etc/config.properties"
-                                               match="karaf.framework.equinox=*"
-                                               replace="#"
-                                               byline="true"/>
-                                <replaceregexp file="target/dependencies/win/apache-karaf-${karaf.version}/etc/config.properties"
-                                               match="karaf.framework.equinox=*"
-                                               replace="#"
-                                               byline="true"/>
-                            </tasks>
-                        </configuration>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <version>${maven-assembly-plugin.version}</version>
-                <executions>
-                    <execution>
-                        <id>unix-bin</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                        <configuration>
-                            <descriptors>
-                                <descriptor>src/main/assembly/unix.xml</descriptor>
-                            </descriptors>
-                            <finalName>${project.artifactId}-${project.version}</finalName>
-                            <tarLongFileMode>gnu</tarLongFileMode>
-                            <appendAssemblyId>false</appendAssemblyId>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>windows-bin</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                        <configuration>
-                            <descriptors>
-                                <descriptor>src/main/assembly/win.xml</descriptor>
-                            </descriptors>
-                            <finalName>${project.artifactId}-${project.version}</finalName>
-                            <appendAssemblyId>false</appendAssemblyId>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
+  <build>
+    <resources>
+      <resource>
+        <directory>src/main/resources</directory>
+        <filtering>false</filtering>
+      </resource>
+      <resource>
+        <directory>src/main/filtered-resources</directory>
+        <includes>
+          <include>**/*</include>
+        </includes>
+        <filtering>true</filtering>
+      </resource>
+    </resources>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-resources-plugin</artifactId>
+        <version>${maven-resources-plugin.version}</version>
+        <configuration>
+          <useDefaultDelimiters>false</useDefaultDelimiters>
+          <delimiters>
+            <delimiter>${*}</delimiter>
+          </delimiters>
+        </configuration>
+        <executions>
+          <execution>
+            <id>filter</id>
+            <phase>generate-resources</phase>
+            <goals>
+              <goal>resources</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>unpack-unix</id>
+            <phase>generate-resources</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
+                <artifactItem>
+                  <groupId>org.apache.karaf</groupId>
+                  <artifactId>apache-karaf</artifactId>
+                  <version>${karaf.version}</version>
+                  <classifier>minimal</classifier>
+                  <type>tar.gz</type>
+                  <outputDirectory>target/dependencies/unix</outputDirectory>
+                </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+          <execution>
+            <id>unpack-win</id>
+            <phase>generate-resources</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
+                <artifactItem>
+                  <groupId>org.apache.karaf</groupId>
+                  <artifactId>apache-karaf</artifactId>
+                  <version>${karaf.version}</version>
+                  <classifier>minimal</classifier>
+                  <type>zip</type>
+                  <outputDirectory>target/dependencies/win</outputDirectory>
+                </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.karaf.tooling</groupId>
+        <artifactId>features-maven-plugin</artifactId>
+        <version>${karaf.version}</version>
+        <executions>
+          <execution>
+            <id>add-features-to-repo</id>
+            <phase>compile</phase>
+            <goals>
+              <goal>add-features-to-repo</goal>
+            </goals>
+            <configuration>
+              <descriptors>
+                <descriptor>
+                  mvn:org.apache.karaf.assemblies.features/standard/${karaf.version}/xml/features
+                </descriptor>
+                <descriptor>
+                  mvn:org.jclouds.karaf/jclouds-karaf/${jclouds.karaf.version}/xml/features
+                </descriptor>
+              </descriptors>
+              <features>
+                <feature>config</feature>
+                <feature>jclouds-guice</feature>
+                <feature>jclouds</feature>
+                <feature>jclouds-compute</feature>
+                <feature>jclouds-nodepool</feature>
+                <feature>jclouds-api-filesystem</feature>
+                <feature>jclouds-api-elasticstack</feature>
+                <feature>jclouds-api-vcloud</feature>
+                <feature>jclouds-api-byon</feature>
+                <feature>jclouds-api-swift</feature>
+                <feature>jclouds-api-openstack-nova</feature>
+                <feature>jclouds-api-openstack-cinder</feature>
+                <feature>jclouds-api-s3</feature>
+                <feature>jclouds-api-ec2</feature>
+                <feature>jclouds-api-cloudstack</feature>
+                <feature>jclouds-api-rackspace-cloudidentity</feature>
+                <feature>jclouds-api-chef</feature>
+                <feature>jclouds-driver-jsch</feature>
+                <feature>jclouds-driver-sshj</feature>
+                <feature>jclouds-driver-slf4j</feature>
+                <feature>jclouds-driver-log4j</feature>
+                <feature>jclouds-driver-bouncycastle</feature>
+                <feature>jclouds-aws-cloudwatch</feature>
+                <feature>jclouds-aws-ec2</feature>
+                <feature>jclouds-aws-s3</feature>
+                <feature>jclouds-azureblob</feature>
+                <feature>jclouds-bluelock-vcloud-zone01</feature>
+                <feature>jclouds-cloudfiles-uk</feature>
+                <feature>jclouds-cloudfiles-us</feature>
+                <feature>jclouds-rackspace-cloudloadbalancers-us</feature>
+                <feature>jclouds-rackspace-cloudloadbalancers-uk</feature>
+                <feature>jclouds-cloudonestorage</feature>
+                <feature>jclouds-cloudserver-uk</feature>
+                <feature>jclouds-cloudserver-us</feature>
+                <feature>jclouds-rackspace-cloudservers-us</feature>
+                <feature>jclouds-rackspace-cloudservers-uk</feature>
+                <feature>jclouds-cloudsigma-zrh</feature>
+                <feature>jclouds-cloudsigma-lvs</feature>
+                <feature>jclouds-elastichosts-lon-b</feature>
+                <feature>jclouds-elastichosts-lon-p</feature>
+                <feature>jclouds-elastichosts-sat-p</feature>
+                <feature>jclouds-elastichosts-lax-p</feature>
+                <feature>jclouds-elastichosts-tor-p</feature>
+                <feature>jclouds-gogrid</feature>
+                <feature>jclouds-go2cloud-jhb1</feature>
+                <feature>jclouds-greenhousedata-element-vcloud</feature>
+                <feature>jclouds-hpcloud-objectstorage</feature>
+                <feature>jclouds-hpcloud-compute</feature>
+                <feature>jclouds-trystack-nova</feature>
+                <feature>jclouds-ninefold-storage</feature>
+                <feature>jclouds-ninefold-compute</feature>
+                <feature>jclouds-openhosting-east1</feature>
+                <feature>jclouds-serverlove-z1-man</feature>
+                <feature>jclouds-skalicloud-sdg-my</feature>
+                <feature>jclouds-softlayer</feature>
+                <feature>jclouds-synaptic-storage</feature>
+                <feature>jclouds-stratogen-vcloud-mycloud</feature>
+                <feature>jclouds-trmk-ecloud</feature>
+                <feature>jclouds-trystack-nova</feature>
+                <feature>jclouds-trmk-vcloudexpress</feature>
+                <feature>jclouds-joyent-cloudapi</feature>
+                <feature>jclouds-joyent</feature>
+                <feature>jclouds-greenqloud-storage</feature>
+                <feature>jclouds-greenqloud-compute</feature>
+                <feature>jclouds-services</feature>
+                <feature>jclouds-commands</feature>
+                <feature>jclouds-chef</feature>
+                <feature>jclouds-url-handler</feature>
+              </features>
+              <includeMvnBasedDescriptors>true</includeMvnBasedDescriptors>
+              <repository>target/features-repo</repository>
+            </configuration>
+            <inherited>false</inherited>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <version>${maven-antrun-plugin.version}</version>
+        <executions>
+          <execution>
+            <phase>prepare-package</phase>
+            <configuration>
+              <tasks>
+                <replace token="#!/bin/bash" value="#!/bin/sh"
+                         dir="target/dependencies/unix/apache-karaf-${karaf.version}/bin">
+                  <include name="*"/>
+                </replace>
+                <replaceregexp file="target/dependencies/unix/apache-karaf-${karaf.version}/etc/config.properties"
+                               match="karaf.framework.equinox=*"
+                               replace="#"
+                               byline="true"/>
+                <replaceregexp file="target/dependencies/win/apache-karaf-${karaf.version}/etc/config.properties"
+                               match="karaf.framework.equinox=*"
+                               replace="#"
+                               byline="true"/>
+              </tasks>
+            </configuration>
+            <goals>
+              <goal>run</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <version>${maven-assembly-plugin.version}</version>
+        <executions>
+          <execution>
+            <id>unix-bin</id>
+            <phase>package</phase>
+            <goals>
+              <goal>single</goal>
+            </goals>
+            <configuration>
+              <descriptors>
+                <descriptor>src/main/assembly/unix.xml</descriptor>
+              </descriptors>
+              <finalName>${project.artifactId}-${project.version}</finalName>
+              <tarLongFileMode>gnu</tarLongFileMode>
+              <appendAssemblyId>false</appendAssemblyId>
+            </configuration>
+          </execution>
+          <execution>
+            <id>windows-bin</id>
+            <phase>package</phase>
+            <goals>
+              <goal>single</goal>
+            </goals>
+            <configuration>
+              <descriptors>
+                <descriptor>src/main/assembly/win.xml</descriptor>
+              </descriptors>
+              <finalName>${project.artifactId}-${project.version}</finalName>
+              <appendAssemblyId>false</appendAssemblyId>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/branding/pom.xml b/branding/pom.xml
index 84e8496..b1da18f 100644
--- a/branding/pom.xml
+++ b/branding/pom.xml
@@ -1,32 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>jclouds-cli-pom</artifactId>
-        <groupId>org.jclouds.cli</groupId>
-        <version>1.7.0-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
+  <parent>
+    <artifactId>jclouds-cli-pom</artifactId>
     <groupId>org.jclouds.cli</groupId>
-    <artifactId>branding</artifactId>
     <version>1.7.0-SNAPSHOT</version>
-    <packaging>bundle</packaging>
-    <name>jclouds :: cli :: branding</name>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>org.jclouds.cli</groupId>
+  <artifactId>branding</artifactId>
+  <version>1.7.0-SNAPSHOT</version>
+  <packaging>bundle</packaging>
+  <name>jclouds :: cli :: branding</name>
 
-    <properties>
-        <osgi.export>org.apache.karaf.branding</osgi.export>
-    </properties>
+  <properties>
+    <osgi.export>org.apache.karaf.branding</osgi.export>
+  </properties>
 
-    <build>
-        <resources>
-            <resource>
-                <directory>${project.basedir}/src/main/resources</directory>
-                <filtering>true</filtering>
-                <includes>
-                    <include>**/*</include>
-                </includes>
-            </resource>
-        </resources>
-    </build>
+  <build>
+    <resources>
+      <resource>
+        <directory>${project.basedir}/src/main/resources</directory>
+        <filtering>true</filtering>
+        <includes>
+          <include>**/*</include>
+        </includes>
+      </resource>
+    </resources>
+  </build>
 
 </project>
diff --git a/pom.xml b/pom.xml
index ee7d9ef..d2a2545 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,211 +1,211 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (C) 2012, the original authors
-  ~
-  ~  Licensed under the Apache License, Version 2.0 (the "License");
-  ~  you may not use this file except in compliance with the License.
-  ~  You may obtain a copy of the License at
-  ~
-  ~  http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~  Unless required by applicable law or agreed to in writing, software
-  ~  distributed under the License is distributed on an "AS IS" BASIS,
-  ~  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~  See the License for the specific language governing permissions and
-  ~  limitations under the License.
-  -->
+~ Copyright (C) 2012, the original authors
+~
+~  Licensed under the Apache License, Version 2.0 (the "License");
+~  you may not use this file except in compliance with the License.
+~  You may obtain a copy of the License at
+~
+~  http://www.apache.org/licenses/LICENSE-2.0
+~
+~  Unless required by applicable law or agreed to in writing, software
+~  distributed under the License is distributed on an "AS IS" BASIS,
+~  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~  See the License for the specific language governing permissions and
+~  limitations under the License.
+-->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-   
-    <parent>
-        <groupId>org.sonatype.oss</groupId>
-        <artifactId>oss-parent</artifactId>
-        <version>4</version>
-    </parent>
+  <modelVersion>4.0.0</modelVersion>
+  
+  <parent>
+    <groupId>org.sonatype.oss</groupId>
+    <artifactId>oss-parent</artifactId>
+    <version>4</version>
+  </parent>
 
-    <groupId>org.jclouds.cli</groupId>
-    <artifactId>jclouds-cli-pom</artifactId>
-    <packaging>pom</packaging>
-    <name>jclouds :: cli</name>
-    <version>1.7.0-SNAPSHOT</version>
+  <groupId>org.jclouds.cli</groupId>
+  <artifactId>jclouds-cli-pom</artifactId>
+  <packaging>pom</packaging>
+  <name>jclouds :: cli</name>
+  <version>1.7.0-SNAPSHOT</version>
 
-    <url>https://github.com/jclouds/jclouds-cli</url>
-    <licenses>
-        <license>
-            <name>The Apache Software License, Version 2.0</name>
-            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-            <distribution>repo</distribution>
-        </license>
-    </licenses>
+  <url>https://github.com/jclouds/jclouds-cli</url>
+  <licenses>
+    <license>
+      <name>The Apache Software License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+      <distribution>repo</distribution>
+    </license>
+  </licenses>
 
-    <scm>
-        <connection>scm:git:git://github.com/jclouds/jclouds-cli.git</connection>
-        <developerConnection>scm:git:ssh://git@github.com/jclouds/jclouds-cli.git</developerConnection>
-        <url>http://github.com/jclouds/jclouds-cli</url>
-    </scm>
+  <scm>
+    <connection>scm:git:git://github.com/jclouds/jclouds-cli.git</connection>
+    <developerConnection>scm:git:ssh://git@github.com/jclouds/jclouds-cli.git</developerConnection>
+    <url>http://github.com/jclouds/jclouds-cli</url>
+  </scm>
 
-    <developers>
-        <developer>
-            <id>iocanel</id>
-            <name>Ioannis Canellos</name>
-            <email>iocanel@gmail.com</email>
-            <url>http://iocanel.blogspot.com</url>
-        </developer>
-        <developer>
-            <id>abayer</id>
-            <name>Andew Bayer</name>
-            <email>abayer@apache.org</email>
-            <url>http://andrewbayer.com</url>
-        </developer>
-    </developers>
+  <developers>
+    <developer>
+      <id>iocanel</id>
+      <name>Ioannis Canellos</name>
+      <email>iocanel@gmail.com</email>
+      <url>http://iocanel.blogspot.com</url>
+    </developer>
+    <developer>
+      <id>abayer</id>
+      <name>Andew Bayer</name>
+      <email>abayer@apache.org</email>
+      <url>http://andrewbayer.com</url>
+    </developer>
+  </developers>
 
-    <modules>
-        <module>branding</module>
-        <module>assembly</module>
-        <module>runner</module>
-    </modules>
+  <modules>
+    <module>branding</module>
+    <module>assembly</module>
+    <module>runner</module>
+  </modules>
 
-    <properties>
-        <!-- Karaf Version Dependencies -->
-        <karaf.version>2.2.7</karaf.version>
-        <pax.url.version>1.2.8</pax.url.version>
-        <pax.logging.version>1.6.5</pax.logging.version>
-        <felix.configadmin.version>1.2.8</felix.configadmin.version>
-        <aries.util.version>0.3</aries.util.version>
-        <aries.proxy.version>0.3</aries.proxy.version>
-        <aries.blueprint.version>0.3.1</aries.blueprint.version>
-        <aries.jmx.version>0.3</aries.jmx.version>
-        <asm.bundle.version>3.3.1_1</asm.bundle.version>
-        <felix.fileinstall.version>3.2.2</felix.fileinstall.version>
-        <jclouds.karaf.version>${project.version}</jclouds.karaf.version>
-        <jclouds.version>${project.version}</jclouds.version>
-        <log4j.version>1.2.17</log4j.version>
-        <slf4j.version>1.6.6</slf4j.version>
-        <!-- Plugin Versions -->
-        <maven-antrun-plugin.version>1.7</maven-antrun-plugin.version>
-        <maven-assembly-plugin.version>2.2.1</maven-assembly-plugin.version>
-        <maven-bundle-plugin.version>2.1.0</maven-bundle-plugin.version>
-        <maven-compiler-plugin.version>2.0.2</maven-compiler-plugin.version>
-        <maven-release-plugin.version>2.2.2</maven-release-plugin.version>
-        <maven-resources-plugin.version>2.4.2</maven-resources-plugin.version>
-        <build-helper-maven-plugin.version>1.5</build-helper-maven-plugin.version>
-    </properties>
+  <properties>
+    <!-- Karaf Version Dependencies -->
+    <karaf.version>2.2.7</karaf.version>
+    <pax.url.version>1.2.8</pax.url.version>
+    <pax.logging.version>1.6.5</pax.logging.version>
+    <felix.configadmin.version>1.2.8</felix.configadmin.version>
+    <aries.util.version>0.3</aries.util.version>
+    <aries.proxy.version>0.3</aries.proxy.version>
+    <aries.blueprint.version>0.3.1</aries.blueprint.version>
+    <aries.jmx.version>0.3</aries.jmx.version>
+    <asm.bundle.version>3.3.1_1</asm.bundle.version>
+    <felix.fileinstall.version>3.2.2</felix.fileinstall.version>
+    <jclouds.karaf.version>${project.version}</jclouds.karaf.version>
+    <jclouds.version>${project.version}</jclouds.version>
+    <log4j.version>1.2.17</log4j.version>
+    <slf4j.version>1.6.6</slf4j.version>
+    <!-- Plugin Versions -->
+    <maven-antrun-plugin.version>1.7</maven-antrun-plugin.version>
+    <maven-assembly-plugin.version>2.2.1</maven-assembly-plugin.version>
+    <maven-bundle-plugin.version>2.1.0</maven-bundle-plugin.version>
+    <maven-compiler-plugin.version>2.0.2</maven-compiler-plugin.version>
+    <maven-release-plugin.version>2.2.2</maven-release-plugin.version>
+    <maven-resources-plugin.version>2.4.2</maven-resources-plugin.version>
+    <build-helper-maven-plugin.version>1.5</build-helper-maven-plugin.version>
+  </properties>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <version>${maven-bundle-plugin.version}</version>
-                <extensions>true</extensions>
-                <inherited>true</inherited>
-                <configuration>
-                    <instructions>
-                        <Bundle-Name>${project.name}</Bundle-Name>
-                        <Bundle-SymbolicName>org.jclouds.cli.${project.artifactId}</Bundle-SymbolicName>
-                        <Export-Package>${osgi.export}</Export-Package>
-                        <Import-Package>${osgi.import}</Import-Package>
-                        <DynamicImport-Package>${osgi.dynamic.import}</DynamicImport-Package>
-                        <Private-Package>${osgi.private}</Private-Package>
-                        <Require-Bundle>${osgi.bundles}</Require-Bundle>
-                        <Bundle-Activator>${osgi.activator}</Bundle-Activator>
-                    </instructions>
-                    <supportedProjectTypes>
-                        <supportedProjectType>jar</supportedProjectType>
-                        <supportedProjectType>war</supportedProjectType>
-                        <supportedProjectType>bundle</supportedProjectType>
-                    </supportedProjectTypes>
-                    <unpackBundle>true</unpackBundle>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>bundle-manifest</id>
-                        <phase>process-classes</phase>
-                        <goals>
-                            <goal>manifest</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>${maven-compiler-plugin.version}</version>
-                <configuration>
-                    <source>1.6</source>
-                    <target>1.6</target>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-release-plugin</artifactId>
-                <version>${maven-release-plugin.version}</version>
-                <configuration>
-                    <preparationGoals>clean install</preparationGoals>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <version>${maven-bundle-plugin.version}</version>
+        <extensions>true</extensions>
+        <inherited>true</inherited>
+        <configuration>
+          <instructions>
+            <Bundle-Name>${project.name}</Bundle-Name>
+            <Bundle-SymbolicName>org.jclouds.cli.${project.artifactId}</Bundle-SymbolicName>
+            <Export-Package>${osgi.export}</Export-Package>
+            <Import-Package>${osgi.import}</Import-Package>
+            <DynamicImport-Package>${osgi.dynamic.import}</DynamicImport-Package>
+            <Private-Package>${osgi.private}</Private-Package>
+            <Require-Bundle>${osgi.bundles}</Require-Bundle>
+            <Bundle-Activator>${osgi.activator}</Bundle-Activator>
+          </instructions>
+          <supportedProjectTypes>
+            <supportedProjectType>jar</supportedProjectType>
+            <supportedProjectType>war</supportedProjectType>
+            <supportedProjectType>bundle</supportedProjectType>
+          </supportedProjectTypes>
+          <unpackBundle>true</unpackBundle>
+        </configuration>
+        <executions>
+          <execution>
+            <id>bundle-manifest</id>
+            <phase>process-classes</phase>
+            <goals>
+              <goal>manifest</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>${maven-compiler-plugin.version}</version>
+        <configuration>
+          <source>1.6</source>
+          <target>1.6</target>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-release-plugin</artifactId>
+        <version>${maven-release-plugin.version}</version>
+        <configuration>
+          <preparationGoals>clean install</preparationGoals>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 
-    <repositories>
-      <repository>
-            <id>jclouds-staging</id>
-            <url>https://oss.sonatype.org/content/repositories/orgjclouds-354</url>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
+  <repositories>
+    <repository>
+      <id>jclouds-staging</id>
+      <url>https://oss.sonatype.org/content/repositories/orgjclouds-354</url>
+      <releases>
+        <enabled>true</enabled>
+      </releases>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+    </repository>
 
-        <repository>
-            <id>sonatype</id>
-            <url>https://oss.sonatype.org/content/repositories/releases/</url>
-        </repository>
-        <repository>
-            <id>maven2-repository.dev.java.net</id>
-            <name>Java.net Repository for Maven</name>
-            <url>http://download.java.net/maven/2/</url>
-            <layout>default</layout>
-        </repository>
-    </repositories>
+    <repository>
+      <id>sonatype</id>
+      <url>https://oss.sonatype.org/content/repositories/releases/</url>
+    </repository>
+    <repository>
+      <id>maven2-repository.dev.java.net</id>
+      <name>Java.net Repository for Maven</name>
+      <url>http://download.java.net/maven/2/</url>
+      <layout>default</layout>
+    </repository>
+  </repositories>
 
-    <profiles>
-        <!-- modifies the plugin config inherited from oss-parent -->
-        <profile>
-            <id>sonatype-release-profile-extension</id>
-            <activation>
-                <property>
-                    <name>performRelease</name>
-                    <value>true</value>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-gpg-plugin</artifactId>
-                        <configuration>
-                            <executable>${gpg.command}</executable>
-                            <passphrase>${gpg.passphrase}</passphrase>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
+  <profiles>
+    <!-- modifies the plugin config inherited from oss-parent -->
+    <profile>
+      <id>sonatype-release-profile-extension</id>
+      <activation>
+        <property>
+          <name>performRelease</name>
+          <value>true</value>
+        </property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-gpg-plugin</artifactId>
+            <configuration>
+              <executable>${gpg.command}</executable>
+              <passphrase>${gpg.passphrase}</passphrase>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
 
-    <distributionManagement>
-        <repository>
-            <id>sonatype-nexus-staging</id>
-            <url>https://oss.sonatype.org/service/local/staging/deploy/maven2</url>
-            <uniqueVersion>false</uniqueVersion>
-        </repository>
-        <snapshotRepository>
-            <id>sonatype-nexus-snapshots</id>
-            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
-        </snapshotRepository>
-    </distributionManagement>
+  <distributionManagement>
+    <repository>
+      <id>sonatype-nexus-staging</id>
+      <url>https://oss.sonatype.org/service/local/staging/deploy/maven2</url>
+      <uniqueVersion>false</uniqueVersion>
+    </repository>
+    <snapshotRepository>
+      <id>sonatype-nexus-snapshots</id>
+      <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+    </snapshotRepository>
+  </distributionManagement>
 
 </project>
diff --git a/runner/pom.xml b/runner/pom.xml
index 19671d8..93e2b68 100644
--- a/runner/pom.xml
+++ b/runner/pom.xml
@@ -1,51 +1,51 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (C) 2012, the original authors
-  ~
-  ~  Licensed under the Apache License, Version 2.0 (the "License");
-  ~  you may not use this file except in compliance with the License.
-  ~  You may obtain a copy of the License at
-  ~
-  ~  http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~  Unless required by applicable law or agreed to in writing, software
-  ~  distributed under the License is distributed on an "AS IS" BASIS,
-  ~  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~  See the License for the specific language governing permissions and
-  ~  limitations under the License.
-  -->
+~ Copyright (C) 2012, the original authors
+~
+~  Licensed under the Apache License, Version 2.0 (the "License");
+~  you may not use this file except in compliance with the License.
+~  You may obtain a copy of the License at
+~
+~  http://www.apache.org/licenses/LICENSE-2.0
+~
+~  Unless required by applicable law or agreed to in writing, software
+~  distributed under the License is distributed on an "AS IS" BASIS,
+~  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~  See the License for the specific language governing permissions and
+~  limitations under the License.
+-->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>jclouds-cli-pom</artifactId>
-        <groupId>org.jclouds.cli</groupId>
-        <version>1.7.0-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
+  <parent>
+    <artifactId>jclouds-cli-pom</artifactId>
     <groupId>org.jclouds.cli</groupId>
-    <artifactId>runner</artifactId>
     <version>1.7.0-SNAPSHOT</version>
-    <name>jclouds :: cli :: runner</name>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>org.jclouds.cli</groupId>
+  <artifactId>runner</artifactId>
+  <version>1.7.0-SNAPSHOT</version>
+  <name>jclouds :: cli :: runner</name>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.karaf.shell</groupId>
-            <artifactId>org.apache.karaf.shell.console</artifactId>
-            <version>${karaf.version}</version>
-        </dependency>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.karaf.shell</groupId>
+      <artifactId>org.apache.karaf.shell.console</artifactId>
+      <version>${karaf.version}</version>
+    </dependency>
 
-        <dependency>
-            <groupId>org.jclouds</groupId>
-            <artifactId>jclouds-blobstore</artifactId>
-            <version>${jclouds.karaf.version}</version>
-        </dependency>
+    <dependency>
+      <groupId>org.jclouds</groupId>
+      <artifactId>jclouds-blobstore</artifactId>
+      <version>${jclouds.karaf.version}</version>
+    </dependency>
 
-        <dependency>
-            <groupId>org.jclouds</groupId>
-            <artifactId>jclouds-core</artifactId>
-            <version>${jclouds.karaf.version}</version>
-        </dependency>
-    </dependencies>
+    <dependency>
+      <groupId>org.jclouds</groupId>
+      <artifactId>jclouds-core</artifactId>
+      <version>${jclouds.karaf.version}</version>
+    </dependency>
+  </dependencies>
 
 </project>