Bundle grapefruit

Grapefruit is a stable tiny library. We're bundling it temporarily
because it currently can't be installed with pip: xav/Grapefruit#15

.travis.yml

@@ -6,9 +6,6 @@ python:
   - 2.7
   - pypy
 
-install:
-  - pip install grapefruit==0.1a3
-
 script:
   - python -m doctest -v fabulous/*.py
 

ez_setup.py

@@ -1,4 +1,4 @@
-#!python
+#!/usr/bin/python
 """Bootstrap setuptools installation
 
 If you want to use setuptools in your package's setup.py, just include this
@@ -276,8 +276,3 @@ def update_md5(filenames):
         update_md5(sys.argv[2:])
     else:
         main(sys.argv[1:])
-
-
-
-
-

fabulous/color.py

@@ -10,9 +10,7 @@
 import sys
 import functools
 
-from fabulous import utils, xterm256
-
-import grapefruit
+from fabulous import utils, xterm256, grapefruit
 
 
 OVERLINE = u'\u203e'
@@ -209,7 +207,7 @@ def parse_color(color):
     (255, 0, 0)
     >>> parse_color((255, 0, 0))
     (255, 0, 0)
-    >>> import grapefruit
+    >>> from fabulous import grapefruit
     >>> parse_color(grapefruit.Color((0.0, 1.0, 0.0)))
     (0, 255, 0)
     """