diff --git a/IPython/config/configurable.py b/IPython/config/configurable.py
index f4f5959..3dc973a 100755
--- a/IPython/config/configurable.py
+++ b/IPython/config/configurable.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # encoding: utf-8
 """
 A base class for objects that are configurable.
diff --git a/IPython/config/tests/test_configurable.py b/IPython/config/tests/test_configurable.py
index 01d4f73..bd1a813 100644
--- a/IPython/config/tests/test_configurable.py
+++ b/IPython/config/tests/test_configurable.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # encoding: utf-8
 """
 Tests for IPython.config.configurable
diff --git a/IPython/config/tests/test_loader.py b/IPython/config/tests/test_loader.py
index e40c585..da97f03 100755
--- a/IPython/config/tests/test_loader.py
+++ b/IPython/config/tests/test_loader.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # encoding: utf-8
 """
 Tests for IPython.config.loader
diff --git a/IPython/core/alias.py b/IPython/core/alias.py
index 264c3b2..7f2b2d7 100755
--- a/IPython/core/alias.py
+++ b/IPython/core/alias.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # encoding: utf-8
 """
 System command aliases.
diff --git a/IPython/core/autocall.py b/IPython/core/autocall.py
index 11c3c56..70ed234 100644
--- a/IPython/core/autocall.py
+++ b/IPython/core/autocall.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # encoding: utf-8
 """
 Autocall capabilities for IPython.core.
diff --git a/IPython/core/display_trap.py b/IPython/core/display_trap.py
index d835b54..3578f6f 100755
--- a/IPython/core/display_trap.py
+++ b/IPython/core/display_trap.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # encoding: utf-8
 """
 A context manager for handling sys.displayhook.
diff --git a/IPython/core/error.py b/IPython/core/error.py
index 8d20ea8..3d033e7 100644
--- a/IPython/core/error.py
+++ b/IPython/core/error.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # encoding: utf-8
 """
 Global exception classes for IPython.core.
@@ -49,4 +48,4 @@ class UsageError(IPythonCoreError):
     
     Something that probably won't warrant a full traceback, but should
     nevertheless interrupt a macro / batch file.   
-    """
\ No newline at end of file
+    """
diff --git a/IPython/core/ipapi.py b/IPython/core/ipapi.py
index 0d79aa0..1c2d5f2 100644
--- a/IPython/core/ipapi.py
+++ b/IPython/core/ipapi.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # encoding: utf-8
 """
 This module is *completely* deprecated and should no longer be used for
diff --git a/IPython/core/page.py b/IPython/core/page.py
index a140d62..6252dbc 100755
--- a/IPython/core/page.py
+++ b/IPython/core/page.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # encoding: utf-8
 """
 Paging capabilities for IPython.core
diff --git a/IPython/core/payloadpage.py b/IPython/core/payloadpage.py
index 363eddb..155a5f5 100755
--- a/IPython/core/payloadpage.py
+++ b/IPython/core/payloadpage.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # encoding: utf-8
 """
 A payload based version of page.
diff --git a/IPython/core/prefilter.py b/IPython/core/prefilter.py
index 2cba403..d497e76 100755
--- a/IPython/core/prefilter.py
+++ b/IPython/core/prefilter.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # encoding: utf-8
 """
 Prefiltering components.
diff --git a/IPython/core/shellapp.py b/IPython/core/shellapp.py
index a93cad2..5f6d2a4 100755
--- a/IPython/core/shellapp.py
+++ b/IPython/core/shellapp.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # encoding: utf-8
 """
 A mixin for :class:`~IPython.core.application.Application` classes that
diff --git a/IPython/core/splitinput.py b/IPython/core/splitinput.py
index 880e183..5cdbb18 100755
--- a/IPython/core/splitinput.py
+++ b/IPython/core/splitinput.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # encoding: utf-8
 """
 Simple utility for splitting user input.
diff --git a/IPython/core/tests/test_imports.py b/IPython/core/tests/test_imports.py
index 7f72a1b..44cf85b 100644
--- a/IPython/core/tests/test_imports.py
+++ b/IPython/core/tests/test_imports.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # encoding: utf-8
 
 def test_import_completer():
diff --git a/IPython/extensions/parallelmagic.py b/IPython/extensions/parallelmagic.py
index b0a0517..cd2c557 100755
--- a/IPython/extensions/parallelmagic.py
+++ b/IPython/extensions/parallelmagic.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # encoding: utf-8
 
 """Magic command interface for interactive parallel work."""
diff --git a/IPython/external/guid/_guid.py b/IPython/external/guid/_guid.py
index da1a226..74859c5 100644
--- a/IPython/external/guid/_guid.py
+++ b/IPython/external/guid/_guid.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # encoding: utf-8
 
 # GUID.py
diff --git a/IPython/external/ssh/forward.py b/IPython/external/ssh/forward.py
index 6431851..27b984a 100644
--- a/IPython/external/ssh/forward.py
+++ b/IPython/external/ssh/forward.py
@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
 #
 # This file is adapted from a paramiko demo, and thus licensed under LGPL 2.1.
 # Original Copyright (C) 2003-2007  Robey Pointer <robeypointer@gmail.com>
diff --git a/IPython/lib/__init__.py b/IPython/lib/__init__.py
index 7b14e55..b5c9e53 100644
--- a/IPython/lib/__init__.py
+++ b/IPython/lib/__init__.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # encoding: utf-8
 """
 Extra capabilities for IPython
diff --git a/IPython/lib/guisupport.py b/IPython/lib/guisupport.py
index 1b9519b..6ffa50a 100755
--- a/IPython/lib/guisupport.py
+++ b/IPython/lib/guisupport.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # coding: utf-8
 """
 Support for creating GUI apps and starting event loops.
diff --git a/IPython/lib/inputhook.py b/IPython/lib/inputhook.py
index 9f8eccb..9c1ea66 100755
--- a/IPython/lib/inputhook.py
+++ b/IPython/lib/inputhook.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # coding: utf-8
 """
 Inputhook management for GUI event loop integration.
diff --git a/IPython/lib/inputhookgtk.py b/IPython/lib/inputhookgtk.py
index 782a65c..358293d 100644
--- a/IPython/lib/inputhookgtk.py
+++ b/IPython/lib/inputhookgtk.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # encoding: utf-8
 """
 Enable pygtk to be used interacive by setting PyOS_InputHook.
diff --git a/IPython/lib/inputhookwx.py b/IPython/lib/inputhookwx.py
index e79b3ce..65f7c3f 100644
--- a/IPython/lib/inputhookwx.py
+++ b/IPython/lib/inputhookwx.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # encoding: utf-8
 
 """
diff --git a/IPython/lib/tests/test_imports.py b/IPython/lib/tests/test_imports.py
index e0e9e9e..3a19015 100644
--- a/IPython/lib/tests/test_imports.py
+++ b/IPython/lib/tests/test_imports.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # encoding: utf-8
 
 def test_import_backgroundjobs():
diff --git a/IPython/parallel/apps/baseapp.py b/IPython/parallel/apps/baseapp.py
index 614fa7f..c456b2e 100755
--- a/IPython/parallel/apps/baseapp.py
+++ b/IPython/parallel/apps/baseapp.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # encoding: utf-8
 """
 The Base Application class for IPython.parallel apps
diff --git a/IPython/parallel/apps/launcher.py b/IPython/parallel/apps/launcher.py
index 4e9bdf6..493c766 100644
--- a/IPython/parallel/apps/launcher.py
+++ b/IPython/parallel/apps/launcher.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # encoding: utf-8
 """
 Facilities for launching IPython processes asynchronously.
diff --git a/IPython/parallel/apps/logwatcher.py b/IPython/parallel/apps/logwatcher.py
index 49599db..6846ad2 100644
--- a/IPython/parallel/apps/logwatcher.py
+++ b/IPython/parallel/apps/logwatcher.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 """
 A simple logger object that consolidates messages incoming from ipcluster processes.
 
diff --git a/IPython/parallel/apps/win32support.py b/IPython/parallel/apps/win32support.py
index ea0d3e5..cbcbc44 100644
--- a/IPython/parallel/apps/win32support.py
+++ b/IPython/parallel/apps/win32support.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 """Utility for forwarding file read events over a zmq socket.
 
 This is necessary because select on Windows only supports sockets, not FDs.
diff --git a/IPython/parallel/apps/winhpcjob.py b/IPython/parallel/apps/winhpcjob.py
index 782d533..f2c748f 100644
--- a/IPython/parallel/apps/winhpcjob.py
+++ b/IPython/parallel/apps/winhpcjob.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # encoding: utf-8
 """
 Job and task components for writing .xml files that the Windows HPC Server 
diff --git a/IPython/parallel/controller/heartmonitor.py b/IPython/parallel/controller/heartmonitor.py
old mode 100644
new mode 100755
diff --git a/IPython/parallel/controller/hub.py b/IPython/parallel/controller/hub.py
index 5a66178..7c3a274 100755
--- a/IPython/parallel/controller/hub.py
+++ b/IPython/parallel/controller/hub.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 """The IPython Controller Hub with 0MQ
 This is the master object that handles connections from engines and clients,
 and monitors traffic through the various queues.
diff --git a/IPython/parallel/engine/engine.py b/IPython/parallel/engine/engine.py
index dd91f8c..f179522 100755
--- a/IPython/parallel/engine/engine.py
+++ b/IPython/parallel/engine/engine.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 """A simple engine that talks to a controller over 0MQ.
 it handles registration, etc. and launches a kernel
 connected to the Controller's Schedulers.
diff --git a/IPython/parallel/engine/streamkernel.py b/IPython/parallel/engine/streamkernel.py
index 5e6203b..4c96de3 100755
--- a/IPython/parallel/engine/streamkernel.py
+++ b/IPython/parallel/engine/streamkernel.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 """
 Kernel adapted from kernel.py to use ZMQ Streams
 
diff --git a/IPython/quarantine/ipy_gnuglobal.py b/IPython/quarantine/ipy_gnuglobal.py
index 93e27bc..ac483f3 100644
--- a/IPython/quarantine/ipy_gnuglobal.py
+++ b/IPython/quarantine/ipy_gnuglobal.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-
-
 """
 Add %global magic for GNU Global usage.
 
diff --git a/IPython/quarantine/ipy_render.py b/IPython/quarantine/ipy_render.py
index 8aa1b72..129d5c3 100644
--- a/IPython/quarantine/ipy_render.py
+++ b/IPython/quarantine/ipy_render.py
@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
 """ IPython extension: Render templates from variables and paste to clipbard """
 
 from IPython.core import ipapi
@@ -65,4 +63,3 @@ def render(tmpl):
     return res
 
 ip.push('render')
-    
\ No newline at end of file
diff --git a/IPython/quarantine/ipy_workdir.py b/IPython/quarantine/ipy_workdir.py
index 620fddc..4b79e44 100644
--- a/IPython/quarantine/ipy_workdir.py
+++ b/IPython/quarantine/ipy_workdir.py
@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
 from IPython.core import ipapi
 ip = ipapi.get()
 
diff --git a/IPython/testing/mkdoctests.py b/IPython/testing/mkdoctests.py
old mode 100644
new mode 100755
diff --git a/IPython/testing/tests/test_tools.py b/IPython/testing/tests/test_tools.py
index cc40a99..9dea513 100644
--- a/IPython/testing/tests/test_tools.py
+++ b/IPython/testing/tests/test_tools.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # encoding: utf-8
 """
 Tests for testing.tools
diff --git a/IPython/utils/ipstruct.py b/IPython/utils/ipstruct.py
index e9898b1..e23faf5 100644
--- a/IPython/utils/ipstruct.py
+++ b/IPython/utils/ipstruct.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # encoding: utf-8
 """A dict subclass that supports attribute style access.
 
diff --git a/IPython/utils/notification.py b/IPython/utils/notification.py
index ef15111..e1c3cfb 100644
--- a/IPython/utils/notification.py
+++ b/IPython/utils/notification.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # encoding: utf-8
 """
 The IPython Core Notification Center.
diff --git a/IPython/utils/syspathcontext.py b/IPython/utils/syspathcontext.py
index e282a25..d931378 100644
--- a/IPython/utils/syspathcontext.py
+++ b/IPython/utils/syspathcontext.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # encoding: utf-8
 """
 Context managers for adding things to sys.path temporarily.
diff --git a/IPython/utils/tests/test_traitlets.py b/IPython/utils/tests/test_traitlets.py
index 5639a50..9d25a03 100755
--- a/IPython/utils/tests/test_traitlets.py
+++ b/IPython/utils/tests/test_traitlets.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # encoding: utf-8
 """
 Tests for IPython.utils.traitlets.
diff --git a/IPython/utils/traitlets.py b/IPython/utils/traitlets.py
index a0ad5ca..fedc401 100644
--- a/IPython/utils/traitlets.py
+++ b/IPython/utils/traitlets.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # encoding: utf-8
 """
 A lightweight Traits like module.
diff --git a/IPython/utils/upgradedir.py b/IPython/utils/upgradedir.py
old mode 100644
new mode 100755
diff --git a/IPython/zmq/kernelapp.py b/IPython/zmq/kernelapp.py
index a9fd44d..730e09e 100644
--- a/IPython/zmq/kernelapp.py
+++ b/IPython/zmq/kernelapp.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 """An Application for launching a kernel
 
 Authors
diff --git a/IPython/zmq/session.py b/IPython/zmq/session.py
index 7d2ebc9..fe56e12 100644
--- a/IPython/zmq/session.py
+++ b/IPython/zmq/session.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 """Session object for building, serializing, sending, and receiving messages in
 IPython. The Session object supports serialization, HMAC signatures, and
 metadata on messages.