Squashed commit of the following:

commit 04b2b00e51e3a60369de4a2ecde07c4cd5f67c57
Author: JensDiemer <git@jensdiemer.de>
Date:   Tue Jun 2 17:58:34 2015 +0200

    --verbose not needed

commit 1206d8fd18f368e0cacb54f76788c5eb855f72c5
Author: JensDiemer <git@jensdiemer.de>
Date:   Tue Jun 2 17:49:13 2015 +0200

    Strange: argparse use stderr in Py2 and stdout in Py3 for --version
;)

commit 82140fcec5c1994081d31b288a28f924a7723ed8
Author: JensDiemer <git@jensdiemer.de>
Date:   Tue Jun 2 17:47:39 2015 +0200

    Bugfix: get rid of the u'' with Py2

commit cdbb3ff08848698ad9e0f7df5bfa7486e60cb7da
Author: JensDiemer <git@jensdiemer.de>
Date:   Tue Jun 2 17:41:03 2015 +0200

    fixup! WIP: refactor CLI tests

commit 6d959e3a9d793eed76cbe606f4cf43843ddfc281
Author: JensDiemer <git@jensdiemer.de>
Date:   Tue Jun 2 17:29:28 2015 +0200

    WIP: refactor CLI tests

commit 4ff6eb4f3454e92b50408541d3ed72215cfc4682
Author: JensDiemer <git@jensdiemer.de>
Date:   Tue Jun 2 16:39:44 2015 +0200

    bixfix travis config?

commit ecc22075a5433e91075700e1e928a63b96090de7
Author: JensDiemer <git@jensdiemer.de>
Date:   Tue Jun 2 16:38:57 2015 +0200

    new v1.3.0

commit 16f4244224856defa711d90b02b0e9498c55b220
Author: JensDiemer <git@jensdiemer.de>
Date:   Tue Jun 2 16:38:46 2015 +0200

    update README

commit ba59454aae040486d77843c9c41f1873fabf7f87
Author: JensDiemer <git@jensdiemer.de>
Date:   Tue Jun 2 16:38:40 2015 +0200

    +"pip install ." makes the CLI available on Travis?!?

commit 75a782dcd679f8c9aea6a5ef43f22245559f32c2
Author: JensDiemer <git@jensdiemer.de>
Date:   Tue Jun 2 16:27:08 2015 +0200

    run nosetests on travis with doctests

commit d3de2ebb979c1d08cc4bda1db439aeac98117500
Author: JensDiemer <git@jensdiemer.de>
Date:   Tue Jun 2 15:49:22 2015 +0200

    use 'json.dumps()' instead of own repr2()

commit 1ec9d9eacbaa1ec475ea2573f0a8744c713073da
Author: JensDiemer <git@jensdiemer.de>
Date:   Tue Jun 2 14:13:50 2015 +0200

    search in sys.path, too.

commit 1a101ec988b3c365d592e5e471f16d2a00700e04
Author: JensDiemer <git@jensdiemer.de>
Date:   Tue Jun 2 14:07:10 2015 +0200

    -"2.6"

commit 514d7b8f28708ad2c81e163e444cdd1901f9a992
Author: JensDiemer <git@jensdiemer.de>
Date:   Tue Jun 2 14:07:00 2015 +0200

    more info

commit 30c67fe9ef1af41a87fa676e6c345ec358a1928d
Author: JensDiemer <git@jensdiemer.de>
Date:   Tue Jun 2 13:52:44 2015 +0200

    sys.exit() if not importable

commit 5bf5c0829ea550609ff160d5240609d6948035d9
Author: JensDiemer <git@jensdiemer.de>
Date:   Tue Jun 2 13:48:46 2015 +0200

    run cli tests via subprocess

commit f9eac72fa1b9f7cfd60f1242887caa86c3d23422
Author: JensDiemer <git@jensdiemer.de>
Date:   Tue Jun 2 13:48:19 2015 +0200

    rename test macros, so that nose will not interpret them as a test
;)

commit 8e7f236490a7374e79d3a342b6446c79b645a484
Author: JensDiemer <git@jensdiemer.de>
Date:   Tue Jun 2 13:47:39 2015 +0200

    use "with"

commit a7376c023f0ef8886bdc8aff05e2eb4db82cb84b
Author: JensDiemer <git@jensdiemer.de>
Date:   Tue Jun 2 13:47:29 2015 +0200

    use nose and add a simple test, if nose is installed

commit 932aacb70ca387302fd6242aa9094df3d80322db
Author: JensDiemer <git@jensdiemer.de>
Date:   Tue Jun 2 13:45:26 2015 +0200

    Bugfix: --version

commit d884abc68a06961dcc0ae99f5642dcfdb560bd90
Author: JensDiemer <git@jensdiemer.de>
Date:   Tue Jun 2 11:00:46 2015 +0200

    use @unittest.expectedFailure

commit 75b21bd449e969bd05d5dcd41c74e2909172fb3f
Author: JensDiemer <git@jensdiemer.de>
Date:   Tue Jun 2 10:54:09 2015 +0200

    WIP: refactor

commit 17041df8d8cf1de91295da50b06de1c7f3bf7c62
Merge: 4285bbf e82d365
Author: JensDiemer <git@jensdiemer.de>
Date:   Tue Jun 2 10:51:55 2015 +0200

    Merge branch 'nose' into refactor

commit 4285bbf7707542772a70b3718d03394cd3537a43
Author: JensDiemer <git@jensdiemer.de>
Date:   Tue Jun 2 10:51:15 2015 +0200

    WIP: refactor

commit e82d365885bd5f23c3ad144d464a11ccb007fdae
Author: JensDiemer <git@jensdiemer.de>
Date:   Tue Jun 2 10:38:24 2015 +0200

    WIP: use nose

2 files changed, 2 insertions, 2 deletions

diff --git a/creole/tests/utils/base_unittest.py b/creole/tests/utils/base_unittest.py
index 92e906c..ee9343f 100644
--- a/creole/tests/utils/base_unittest.py
+++ b/creole/tests/utils/base_unittest.py
@@ -36,7 +36,7 @@ from creole.exceptions import DocutilsImportError
 from creole import creole2html, html2creole, html2textile, html2rest
 
 try:
-    from creole.rest2html.clean_writer import rest2html
+    from creole.rest_tools.clean_writer import rest2html
 except DocutilsImportError as err:
     REST_INSTALLED = False
     warnings.warn("Can't run all ReSt unittests: %s" % err)
diff --git a/creole/tests/utils/utils.py b/creole/tests/utils/utils.py
index ef202e0..5e2b24a 100644
--- a/creole/tests/utils/utils.py
+++ b/creole/tests/utils/utils.py
@@ -14,6 +14,7 @@
 from __future__ import division, absolute_import, print_function, unicode_literals
 
 import difflib
+import textwrap
 import unittest
 
 
@@ -78,7 +79,6 @@ class MarkupTest(unittest.TestCase):
         """
         prepare the multiline, indentation text.
         """
-        #txt = unicode(txt)
         txt = txt.splitlines()
         assert txt[0] == "", "First assertion line must be empty! Is: %s" % repr(txt[0])
         txt = txt[1:] # Skip the first line