Updates for push.

README.rst

@@ -1,17 +1,17 @@
-Tabbed: format-agnostic tabular dataset library
+Tablib: format-agnostic tabular dataset library
 ===============================================
 
 ::
 
-    _____         ______  ______        _________
-    __  /_______ ____  /_ ___  /_ _____ ______  /
-    _  __/_  __ `/__  __ \__  __ \_  _ \_  __  / 
-    / /_  / /_/ / _  /_/ /_  /_/ //  __// /_/ /  
-    \__/  \__,_/  /_.___/ /_.___/ \___/ \__,_/   
+	_____         ______  ___________ ______  
+	__  /_______ ____  /_ ___  /___(_)___  /_ 
+	_  __/_  __ `/__  __ \__  / __  / __  __ \
+	/ /_  / /_/ / _  /_/ /_  /  _  /  _  /_/ /
+	\__/  \__,_/  /_.___/ /_/   /_/   /_.___/
 
 
 
-Tabbed is a format-agnostic tabular dataset library, written in Python. 
+Tablib is a format-agnostic tabular dataset library, written in Python. 
 It is a full python module which doubles as a CLI application for quick
 dataset conversions. 
 
@@ -22,9 +22,9 @@ Formats supported:
 - Excel
 - CSV
 
-At this time, Tabbed supports the **export** of it's powerful Dataset object instances into any of the above formats. Import is underway.
+At this time, Tablib supports the **export** of it's powerful Dataset object instances into any of the above formats. Import is underway.
 
-Please note that tabbed *purposefully* excludes XML support. It always will.
+Please note that tablib *purposefully* excludes XML support. It always will.
 
 
 Features

setup.py

@@ -2,7 +2,6 @@
 
 import os
 import sys
-import tablib
 
 from distutils.core import setup
 
@@ -18,7 +17,7 @@ if sys.argv[-1] == "publish":
 
 setup(
 	name='tablib',
-	version='0.6.0',
+	version='0.6.1',
 	description='Format agnostic tabular data library (XLS, CSV, JSON, YAML, CSV)',
 	long_description=open('README.rst').read() + '\n\n' +
 	                 open('HISTORY.rst').read(),

tablib/core.py

@@ -9,18 +9,15 @@
 
 import csv
 import cStringIO
-import os
-
-from helpers import *
-import simplejson as json
-import xlwt
 import random
 
 
-try:
-    import yaml
-except ImportError, why:
-    from packages import yaml
+from helpers import *
+import simplejson as json
+
+
+import xlwt
+import yaml