diff --git a/AUTHORS b/AUTHORS
index 04c6286..b25d7e1 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -22,3 +22,4 @@ Patches and Suggestions
 - Jason Piper <jpiper>
 - Gianluca Brindisi <gbrindisi>
 - Don Spaulding <donspauldingii@gmail.com>
+- Justin Barber <barber.justin (at) gmail>
diff --git a/clint/__init__.py b/clint/__init__.py
index 609b948..1f9b02d 100644
--- a/clint/__init__.py
+++ b/clint/__init__.py
@@ -11,7 +11,14 @@ This module sets up the main interface for all of clint.
 
 from __future__ import absolute_import
 
-from . import arguments
+try:
+    from collections import OrderedDict
+except ImportError:
+    from .packages.ordereddict import OrderedDict
+    import collections
+    collections.OrderedDict = OrderedDict
+
+from args import *
 from . import textui
 from . import utils
 from .pipes import piped_in
@@ -25,6 +32,3 @@ __author__ = 'Kenneth Reitz'
 __license__ = 'ISC'
 __copyright__ = 'Copyright 2012 Kenneth Reitz'
 __docformat__ = 'restructuredtext'
-
-
-args = arguments.Args()
diff --git a/setup.py b/setup.py
index 78d9904..5cd00a4 100755
--- a/setup.py
+++ b/setup.py
@@ -4,7 +4,10 @@
 import os
 import sys
 
-from distutils.core import setup
+try:
+    from setuptools import setup
+except ImportError:
+    from distutils.core import setup
 
 import clint
 
@@ -18,7 +21,7 @@ if sys.argv[-1] == "publish":
     publish()
     sys.exit()
 
-required = []
+required = ['args']
 
 setup(
     name='clint',
@@ -48,7 +51,6 @@ setup(
         'License :: OSI Approved :: ISC License (ISCL)',
         'Programming Language :: Python',
         'Programming Language :: Python :: 2',
-        'Programming Language :: Python :: 2.5',
         'Programming Language :: Python :: 2.6',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
diff --git a/tox.ini b/tox.ini
index 82becb5..24c96a5 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,9 +1,10 @@
 [tox]
-envlist = py25,py26,py27,py3
+envlist = py26,py27,py3
 
 [testenv]
 commands=py.test --junitxml=junit-{envname}.xml
 deps = pytest
+    args
 
 [testenv:pypy]
 basepython=/usr/bin/pypy-c