Merge branch 'master' into staging

pkgs/development/python-modules/httpretty/setup.py.patch

@@ -0,0 +1,11 @@
+--- setup.py    2016-04-18 10:44:27.915536022 -0500
++++ setup-new.py           2016-04-18 10:44:13.515537377 -0500
+@@ -75,7 +75,7 @@
+
+
+ local_file = lambda *f: \
+-    open(os.path.join(os.path.dirname(__file__), *f)).read()
++    open(os.path.join(os.path.dirname(__file__), *f), encoding="utf-8").read()
+
+
+ install_requires, dependency_links = \

pkgs/development/python-modules/mathics/disable_console_tests.patch

@@ -1,21 +0,0 @@
-These tests require that Mathics already be installed to work,
-which is not true when nix runs them.
-
---- a/test/test_console.py	2015-09-07 21:41:08.530501979 -0700
-+++ b/test/test_console.py	2015-09-07 21:42:44.082176084 -0700
-@@ -13,6 +13,7 @@
-         os.environ["TERM"] = "dumb"
-         self.console = pexpect.spawn('python2 mathics/main.py --color NOCOLOR')
- 
-+    @unittest.expectedFailure
-     def testLaunch(self):
-         cons = self.console
- 
-@@ -41,6 +42,7 @@
-             'Quit by pressing CONTROL-D\r\n'
-             '\r\n')
- 
-+    @unittest.expectedFailure
-     def testPrompt(self):
-         cons = self.console
-         cons.expect('Quit by pressing CONTROL-D\r\n\r\n')