Merge branch 'jedsmith/master'

CONTRIBUTORS.txt

@@ -108,4 +108,5 @@ Loren Abrams, 2012/06/19
 Eran Rundstein, 2012/06/24
 John Watson, 2012/06/27
 David Markey, 2012/07/05
-Jared Biel, 2012/07/05
+Jared Biel, 2012/07/05
+Jed Smith, 2012/07/08

setup.py

@@ -29,7 +29,7 @@ try:
         print('Upgrade: no old version found.')
     finally:
         sys.path[:] = orig_path
-except ImportError:
+except:
     pass