Merge branch 'master' of https://github.com/timmartin19/cqlengine

Conflicts:
	cqlengine/VERSION
	cqlengine/models.py
	cqlengine/query.py

cqlengine/VERSION

@@ -1 +1,5 @@
+<<<<<<< HEAD
 0.19.0
+=======
+0.18.2
+>>>>>>> FETCH_HEAD

cqlengine/query.py

@@ -851,7 +851,6 @@ class DMLQuery(object):
             return self._batch.add_query(q)
         else:
             tmp = execute(q, consistency_level=self._consistency)
-<<<<<<< HEAD
             if self._if_not_exists:
                 check_applied(tmp)
             if self._transaction and tmp[0].get('[applied]', True) is False:
@@ -860,8 +859,6 @@ class DMLQuery(object):
                 actual = ', '.join('{0}={1}'.format(f, v) for f, v in tmp[0].items())
                 message = 'Transaction statement failed: Expected: {0}  Actual: {1}'.format(expected, actual)
                 raise TransactionException(message)
-=======
->>>>>>> Small fixes and tests added
             return tmp
 
     def batch(self, batch_obj):
@@ -972,7 +969,6 @@ class DMLQuery(object):
             return self.update()
         else:
             insert = InsertStatement(self.column_family_name, ttl=self._ttl, timestamp=self._timestamp, if_not_exists=self._if_not_exists, transactions=self._transaction)
-
             for name, col in self.instance._columns.items():
                 val = getattr(self.instance, name, None)
                 if col._val_is_null(val):

setup.py

@@ -17,7 +17,7 @@ Cassandra CQL 3 Object Mapper for Python
 """
 
 setup(
-    name='cqlengine',
+    name='vk-cqlengine',
     version=version,
     description='Cassandra CQL 3 Object Mapper for Python',
     long_description=long_desc,
@@ -35,7 +35,7 @@ setup(
     author='Blake Eggleston, Jon Haddad',
     author_email='bdeggleston@gmail.com, jon@jonhaddad.com',
     url='https://github.com/cqlengine/cqlengine',
-    license='BSD',
+    license='Private',
     packages=find_packages(),
     include_package_data=True,
 )