Merge branch 'master' into develop

# Conflicts:
#	CHANGELOG.txt
#	can/__init__.py
#	can/interface.py
#	can/interfaces/vector/canlib.py

Author: hardbyte

can/__init__.py

@@ -1,3 +1,4 @@
+#!/usr/bin/env python
 # coding: utf-8
 
 """

can/interface.py

@@ -125,7 +125,7 @@ def __new__(cls, channel=None, *args, **config):
             # Use the default channel for the backend
             return cls(*args, **config)
         else:
-            return cls(channel, *args, **config)    
+            return cls(channel, *args, **config)
 
 
 def detect_available_configs(interfaces=None):

can/interfaces/vector/canlib.py

@@ -112,7 +112,7 @@ def __init__(self, channel, can_filters=None, poll_interval=0.01,
         # Get channels masks
         self.channel_masks = {}
         self.index_to_channel = {}
-        
+
         for channel in self.channels:
             if app_name:
                 # Get global channel index from application channel