diff --git a/src/main/scala/com/shorrockin/cascal/model/ColumnFamily.scala b/src/main/scala/com/shorrockin/cascal/model/ColumnFamily.scala
index 22ee0d5..008ef40 100644
--- a/src/main/scala/com/shorrockin/cascal/model/ColumnFamily.scala
+++ b/src/main/scala/com/shorrockin/cascal/model/ColumnFamily.scala
@@ -13,7 +13,7 @@ import org.apache.cassandra.thrift.ColumnParent
 trait ColumnFamily[+KeyType] extends StringValue {
   val keyspace:Keyspace
   lazy val columnParent = new ColumnParent().setColumn_family(value)
-  
+
   def \(value:String):KeyType
 
 }
\ No newline at end of file
diff --git a/src/main/scala/com/shorrockin/cascal/session/Operation.scala b/src/main/scala/com/shorrockin/cascal/session/Operation.scala
index 871bc50..f42538e 100644
--- a/src/main/scala/com/shorrockin/cascal/session/Operation.scala
+++ b/src/main/scala/com/shorrockin/cascal/session/Operation.scala
@@ -65,7 +65,7 @@ class Delete(val container:ColumnContainer[_, _], val predicate:Predicate) exten
 
     out.setDeletion(del)
   }
-  
+
   val family = container.family
   val key = container.key
   val keyspace = container.keyspace
diff --git a/src/main/scala/com/shorrockin/cascal/utils/UUID.scala b/src/main/scala/com/shorrockin/cascal/utils/UUID.scala
index eaff6ab..bafeedc 100644
--- a/src/main/scala/com/shorrockin/cascal/utils/UUID.scala
+++ b/src/main/scala/com/shorrockin/cascal/utils/UUID.scala
@@ -11,7 +11,7 @@ import _root_.com.eaio.uuid.{UUID => EaioUUID}
  * @author Chris Shorrock
  */
 object UUID {
-  
+
   /**
    * returns a new uuid, can be used as a time uuid
    */
diff --git a/src/test/resources/storage-conf.xml b/src/test/resources/storage-conf.xml
index ecf9bdc..c610672 100755
--- a/src/test/resources/storage-conf.xml
+++ b/src/test/resources/storage-conf.xml
@@ -44,8 +44,8 @@
   </Keyspaces>
 
   <!--
-   ~ Turn on to make new [non-seed] nodes automatically migrate the right data 
-   ~ to themselves.  (If no InitialToken is specified, they will pick one 
+   ~ Turn on to make new [non-seed] nodes automatically migrate the right data
+   ~ to themselves.  (If no InitialToken is specified, they will pick one
    ~ such that they will get half the range of the most-loaded node.)
    ~ If a node starts up without bootstrapping, it will mark itself bootstrapped
    ~ so that you can't subsequently accidently bootstrap a node with
@@ -65,7 +65,7 @@
    ~ Authenticator: any IAuthenticator may be used, including your own as long
    ~ as it is on the classpath.  Out of the box, Cassandra provides
    ~ org.apache.cassandra.auth.AllowAllAuthenticator and,
-   ~ org.apache.cassandra.auth.SimpleAuthenticator 
+   ~ org.apache.cassandra.auth.SimpleAuthenticator
    ~ (SimpleAuthenticator uses access.properties and passwd.properties by
    ~ default).
    ~
@@ -96,7 +96,7 @@
    ~ are sent to the node with the "closest" token, so distributing your
    ~ tokens equally along the key distribution space will spread keys
    ~ evenly across your cluster.)  This setting is only checked the first
-   ~ time a node is started. 
+   ~ time a node is started.
 
    ~ This can also be useful with RandomPartitioner to force equal spacing
    ~ of tokens around the hash space, especially for clusters with a small
@@ -110,7 +110,7 @@
    ~ performance
   -->
   <CommitLogDirectory>%temp-dir%commitlog</CommitLogDirectory>
-    
+
   <DataFileDirectories>
       <DataFileDirectory>%temp-dir%data</DataFileDirectory>
   </DataFileDirectories>
@@ -136,9 +136,9 @@
 
   <!-- Local hosts and ports -->
 
-  <!-- 
+  <!--
    ~ Address to bind to and tell other nodes to connect to.  You _must_
-   ~ change this if you want multiple nodes to be able to communicate!  
+   ~ change this if you want multiple nodes to be able to communicate!
    ~
    ~ Leaving it blank leaves it up to InetAddress.getLocalHost(). This
    ~ will always do the Right Thing *if* the node is properly configured
@@ -160,9 +160,9 @@
   <ThriftAddress>localhost</ThriftAddress>
   <!-- Thrift RPC port (the port clients connect to). -->
   <ThriftPort>9160</ThriftPort>
-  <!-- 
+  <!--
    ~ Whether or not to use a framed transport for Thrift. If this option
-   ~ is set to true then you must also use a framed transport on the 
+   ~ is set to true then you must also use a framed transport on the
    ~ client-side, (framed and non-framed transports are not compatible).
   -->
   <ThriftFramedTransport>false</ThriftFramedTransport>
@@ -194,16 +194,16 @@
 
   <!--
    ~ Buffer size to use when performing contiguous column slices. Increase
-   ~ this to the size of the column slices you typically perform. 
-   ~ (Name-based queries are performed with a buffer size of 
+   ~ this to the size of the column slices you typically perform.
+   ~ (Name-based queries are performed with a buffer size of
    ~ ColumnIndexSizeInKB.)
   -->
   <SlicedBufferSizeInKB>64</SlicedBufferSizeInKB>
 
   <!--
-   ~ Buffer size to use when flushing memtables to disk. (Only one 
+   ~ Buffer size to use when flushing memtables to disk. (Only one
    ~ memtable is ever flushed at a time.) Increase (decrease) the index
-   ~ buffer size relative to the data buffer if you have few (many) 
+   ~ buffer size relative to the data buffer if you have few (many)
    ~ columns per key.  Bigger is only better _if_ your memtables get large
    ~ enough to use the space. (Check in your data directory after your
    ~ app has been running long enough.) -->
@@ -223,7 +223,7 @@
 
   <!--
    ~ Flush memtable after this much data has been inserted, including
-   ~ overwritten data.  There is one memtable per column family, and 
+   ~ overwritten data.  There is one memtable per column family, and
    ~ this threshold is based solely on the amount of data stored, not
    ~ actual heap memory usage (there is some overhead in indexing the
    ~ columns).
@@ -288,7 +288,7 @@
    ~ individually).  Reasonable values range from a minimal 0.1 to 10 or
    ~ even more if throughput matters more than latency.
   -->
-  <!-- <CommitLogSyncBatchWindowInMS>1</CommitLogSyncBatchWindowInMS> --> 
+  <!-- <CommitLogSyncBatchWindowInMS>1</CommitLogSyncBatchWindowInMS> -->
 
   <!--
    ~ Time to wait before garbage-collection deletion markers.  Set this to