diff --git a/easybuild/easyconfigs/a/ABINIT/ABINIT-7.0.3-x86_64_linux_gnu4.5.eb b/easybuild/easyconfigs/a/ABINIT/ABINIT-7.0.3-x86_64_linux_gnu4.5.eb
index a0768a4fb37..a8e8be16111 100644
--- a/easybuild/easyconfigs/a/ABINIT/ABINIT-7.0.3-x86_64_linux_gnu4.5.eb
+++ b/easybuild/easyconfigs/a/ABINIT/ABINIT-7.0.3-x86_64_linux_gnu4.5.eb
@@ -27,7 +27,7 @@ sources = [('abinit-%s_%s.bz2' % (version, versionsuffix[1:]), 'tar xfj %s')]
 source_urls = ['http://ftp.abinit.org/']
 
 sanity_check_paths = {
-                      'files': ["bin/abinit"], 
+                      'files': ["bin/abinit"],
                       'dirs': []
                      }
 
diff --git a/easybuild/easyconfigs/a/ABINIT/ABINIT-7.0.5-x86_64_linux_gnu4.5.eb b/easybuild/easyconfigs/a/ABINIT/ABINIT-7.0.5-x86_64_linux_gnu4.5.eb
index 0e53b02003a..083d321a07d 100644
--- a/easybuild/easyconfigs/a/ABINIT/ABINIT-7.0.5-x86_64_linux_gnu4.5.eb
+++ b/easybuild/easyconfigs/a/ABINIT/ABINIT-7.0.5-x86_64_linux_gnu4.5.eb
@@ -29,7 +29,7 @@ sources = [('abinit-%s_%s.bz2' % (version, versionsuffix[1:]), 'tar xfj %s')]
 source_urls = ['http://ftp.abinit.org/']
 
 sanity_check_paths = {
-                      'files': ["bin/abinit"], 
+                      'files': ["bin/abinit"],
                       'dirs': []
                      }
 
diff --git a/easybuild/easyconfigs/a/ABINIT/ABINIT-7.2.1-x86_64_linux_gnu4.5.eb b/easybuild/easyconfigs/a/ABINIT/ABINIT-7.2.1-x86_64_linux_gnu4.5.eb
index 7722a1277b7..5ccd2f15a76 100644
--- a/easybuild/easyconfigs/a/ABINIT/ABINIT-7.2.1-x86_64_linux_gnu4.5.eb
+++ b/easybuild/easyconfigs/a/ABINIT/ABINIT-7.2.1-x86_64_linux_gnu4.5.eb
@@ -30,7 +30,7 @@ sources = [('abinit-%s_%s.bz2' % (version, versionsuffix[1:]), 'tar xfj %s')]
 source_urls = ['http://ftp.abinit.org/']
 
 sanity_check_paths = {
-                      'files': ["bin/abinit"], 
+                      'files': ["bin/abinit"],
                       'dirs': []
                      }
 
diff --git a/easybuild/easyconfigs/a/ABINIT/ABINIT-7.4.3-goolf-1.4.10-ETSF_IO-1.0.4.eb b/easybuild/easyconfigs/a/ABINIT/ABINIT-7.4.3-goolf-1.4.10-ETSF_IO-1.0.4.eb
index 4d319523ace..f598583eb77 100644
--- a/easybuild/easyconfigs/a/ABINIT/ABINIT-7.4.3-goolf-1.4.10-ETSF_IO-1.0.4.eb
+++ b/easybuild/easyconfigs/a/ABINIT/ABINIT-7.4.3-goolf-1.4.10-ETSF_IO-1.0.4.eb
@@ -33,7 +33,7 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files': ["bin/abinit"], 
+    'files': ["bin/abinit"],
     'dirs': []
 }
 
diff --git a/easybuild/easyconfigs/a/ABySS/ABySS-1.3.6-goolf-1.4.10-Python-2.7.5.eb b/easybuild/easyconfigs/a/ABySS/ABySS-1.3.6-goolf-1.4.10-Python-2.7.5.eb
index cdc9d8c7ad2..93b76ef8bea 100644
--- a/easybuild/easyconfigs/a/ABySS/ABySS-1.3.6-goolf-1.4.10-Python-2.7.5.eb
+++ b/easybuild/easyconfigs/a/ABySS/ABySS-1.3.6-goolf-1.4.10-Python-2.7.5.eb
@@ -26,11 +26,11 @@ toolchainopts = {'usempi': True}
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = ['http://www.bcgsc.ca/downloads/abyss/']
 
-dependencies = [ 
+dependencies = [
     ('sparsehash', '2.0.2'),
     ('Boost', '1.49.0', versionsuffix),
 ]
- 
+
 sanity_check_paths = {
     'files': ["bin/ABYSS", "bin/ABYSS-P"],
     'dirs': []
diff --git a/easybuild/easyconfigs/a/ANTLR/ANTLR-2.7.7-ictce-5.4.0.eb b/easybuild/easyconfigs/a/ANTLR/ANTLR-2.7.7-ictce-5.4.0.eb
index b32cf6ce866..f40658d1411 100644
--- a/easybuild/easyconfigs/a/ANTLR/ANTLR-2.7.7-ictce-5.4.0.eb
+++ b/easybuild/easyconfigs/a/ANTLR/ANTLR-2.7.7-ictce-5.4.0.eb
@@ -13,7 +13,7 @@ sources = [SOURCELOWER_TAR_GZ]
 
 patches = ['ANTLR-%(version)s_cpp-headers.patch']
 
-dependencies = [('Java', '1.7.0_60', '', True)] 
+dependencies = [('Java', '1.7.0_60', '', True)]
 
 configopts = "--disable-examples --disable-csharp"
 
diff --git a/easybuild/easyconfigs/a/ANTLR/ANTLR-2.7.7-intel-2014b.eb b/easybuild/easyconfigs/a/ANTLR/ANTLR-2.7.7-intel-2014b.eb
index 5cf3b03e646..8ba4070760d 100644
--- a/easybuild/easyconfigs/a/ANTLR/ANTLR-2.7.7-intel-2014b.eb
+++ b/easybuild/easyconfigs/a/ANTLR/ANTLR-2.7.7-intel-2014b.eb
@@ -13,7 +13,7 @@ sources = [SOURCELOWER_TAR_GZ]
 
 patches = ['ANTLR-%(version)s_cpp-headers.patch']
 
-dependencies = [('Java', '1.7.0_60', '', True)] 
+dependencies = [('Java', '1.7.0_60', '', True)]
 
 configopts = "--disable-examples --disable-csharp"
 
diff --git a/easybuild/easyconfigs/a/ANTLR/ANTLR-2.7.7-intel-2015a-Python-2.7.10.eb b/easybuild/easyconfigs/a/ANTLR/ANTLR-2.7.7-intel-2015a-Python-2.7.10.eb
index 66d819dd00f..31ae0ccb152 100644
--- a/easybuild/easyconfigs/a/ANTLR/ANTLR-2.7.7-intel-2015a-Python-2.7.10.eb
+++ b/easybuild/easyconfigs/a/ANTLR/ANTLR-2.7.7-intel-2015a-Python-2.7.10.eb
@@ -10,7 +10,7 @@ description = """ANTLR, ANother Tool for Language Recognition, (formerly PCCTS)
  Java, C#, C++, or Python actions."""
 
 toolchain = {'name': 'intel', 'version': '2015a'}
-  
+
 source_urls = ['http://www.antlr2.org/download/']
 sources = [SOURCELOWER_TAR_GZ]
 
diff --git a/easybuild/easyconfigs/a/ANTLR/ANTLR-2.7.7-intel-2015b-Python-2.7.10.eb b/easybuild/easyconfigs/a/ANTLR/ANTLR-2.7.7-intel-2015b-Python-2.7.10.eb
index 555ece231a9..00631356607 100644
--- a/easybuild/easyconfigs/a/ANTLR/ANTLR-2.7.7-intel-2015b-Python-2.7.10.eb
+++ b/easybuild/easyconfigs/a/ANTLR/ANTLR-2.7.7-intel-2015b-Python-2.7.10.eb
@@ -10,7 +10,7 @@ description = """ANTLR, ANother Tool for Language Recognition, (formerly PCCTS)
  Java, C#, C++, or Python actions."""
 
 toolchain = {'name': 'intel', 'version': '2015b'}
-  
+
 source_urls = ['http://www.antlr2.org/download/']
 sources = [SOURCELOWER_TAR_GZ]
 
diff --git a/easybuild/easyconfigs/a/Automake/Automake-1.13.4-ictce-5.5.0.eb b/easybuild/easyconfigs/a/Automake/Automake-1.13.4-ictce-5.5.0.eb
index 675782f77b2..5661ddb517b 100644
--- a/easybuild/easyconfigs/a/Automake/Automake-1.13.4-ictce-5.5.0.eb
+++ b/easybuild/easyconfigs/a/Automake/Automake-1.13.4-ictce-5.5.0.eb
@@ -16,7 +16,7 @@ description = "Automake: GNU Standards-compliant Makefile generator"
 
 source_urls = [GNU_SOURCE]
 sources = [SOURCELOWER_TAR_GZ]
-toolchain = {'name': 'ictce', 'version': '5.5.0'} 
+toolchain = {'name': 'ictce', 'version': '5.5.0'}
 
 dependencies = [('Autoconf', '2.69')]
 
diff --git a/easybuild/easyconfigs/b/BCFtools/BCFtools-1.2-foss-2015a.eb b/easybuild/easyconfigs/b/BCFtools/BCFtools-1.2-foss-2015a.eb
index 7aa9dcdd5bb..1e64be716a5 100644
--- a/easybuild/easyconfigs/b/BCFtools/BCFtools-1.2-foss-2015a.eb
+++ b/easybuild/easyconfigs/b/BCFtools/BCFtools-1.2-foss-2015a.eb
@@ -20,7 +20,7 @@ dependencies = [
     ('zlib', '1.2.8'),
 ]
 
-parallel = 1 
+parallel = 1
 
 skipsteps = ['configure']
 
diff --git a/easybuild/easyconfigs/b/BCFtools/BCFtools-1.2-intel-2015a.eb b/easybuild/easyconfigs/b/BCFtools/BCFtools-1.2-intel-2015a.eb
index c997c54557f..2143e1fd78e 100644
--- a/easybuild/easyconfigs/b/BCFtools/BCFtools-1.2-intel-2015a.eb
+++ b/easybuild/easyconfigs/b/BCFtools/BCFtools-1.2-intel-2015a.eb
@@ -20,7 +20,7 @@ dependencies = [
     ('zlib', '1.2.8'),
 ]
 
-parallel = 1 
+parallel = 1
 
 skipsteps = ['configure']
 
diff --git a/easybuild/easyconfigs/b/BSMAP/BSMAP-2.74-goolf-1.4.10.eb b/easybuild/easyconfigs/b/BSMAP/BSMAP-2.74-goolf-1.4.10.eb
index 13183744183..d31fc0a136a 100644
--- a/easybuild/easyconfigs/b/BSMAP/BSMAP-2.74-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/b/BSMAP/BSMAP-2.74-goolf-1.4.10.eb
@@ -1,4 +1,4 @@
-easyblock = 'ConfigureMake' 
+easyblock = 'ConfigureMake'
 
 name = 'BSMAP'
 version = '2.74'
@@ -13,7 +13,7 @@ sources = [SOURCELOWER_TGZ]
 
 skipsteps = ['configure']
 
-installopts = "DESTDIR=%(installdir)s" 
+installopts = "DESTDIR=%(installdir)s"
 
 patches = [
      'BSMAP-2.74_makefile-modif.patch',
diff --git a/easybuild/easyconfigs/b/Biopython/Biopython-1.61-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/b/Biopython/Biopython-1.61-goolf-1.4.10-Python-2.7.3.eb
index d287d552925..baf247c07d3 100644
--- a/easybuild/easyconfigs/b/Biopython/Biopython-1.61-goolf-1.4.10-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/b/Biopython/Biopython-1.61-goolf-1.4.10-Python-2.7.3.eb
@@ -35,7 +35,7 @@ dependencies = [
 
 sanity_check_paths = {
     'files': [],
-    'dirs': ['lib/python%s/site-packages/Bio' % pyshortver, 
+    'dirs': ['lib/python%s/site-packages/Bio' % pyshortver,
         'lib/python%s/site-packages/biopython-%s-py%s.egg-info' % (pyshortver, version,\
             pyshortver),
         'lib/python%s/site-packages/BioSQL' % pyshortver]
diff --git a/easybuild/easyconfigs/b/Biopython/Biopython-1.61-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/b/Biopython/Biopython-1.61-ictce-5.3.0-Python-2.7.3.eb
index eca39ee0dfb..96eae4f6355 100644
--- a/easybuild/easyconfigs/b/Biopython/Biopython-1.61-ictce-5.3.0-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/b/Biopython/Biopython-1.61-ictce-5.3.0-Python-2.7.3.eb
@@ -35,7 +35,7 @@ dependencies = [
 
 sanity_check_paths = {
     'files': [],
-    'dirs': ['lib/python%s/site-packages/Bio' % pyshortver, 
+    'dirs': ['lib/python%s/site-packages/Bio' % pyshortver,
         'lib/python%s/site-packages/biopython-%s-py%s.egg-info' % (pyshortver, version,\
             pyshortver),
         'lib/python%s/site-packages/BioSQL' % pyshortver]
diff --git a/easybuild/easyconfigs/b/Bismark/Bismark-0.10.1-goolf-1.4.10.eb b/easybuild/easyconfigs/b/Bismark/Bismark-0.10.1-goolf-1.4.10.eb
index 337980614fb..07dcfa192dd 100644
--- a/easybuild/easyconfigs/b/Bismark/Bismark-0.10.1-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/b/Bismark/Bismark-0.10.1-goolf-1.4.10.eb
@@ -23,9 +23,9 @@ sources = ['%s_v%s.tar.gz' % (name.lower(), version) ]
 dependencies = [('Bowtie2', '2.0.2')]
 
 sanity_check_paths = {
-     'files': ["bismark", "bismark2bedGraph", "bismark2report", "bismark_genome_preparation", 
+     'files': ["bismark", "bismark2bedGraph", "bismark2report", "bismark_genome_preparation",
                "bismark_methylation_extractor", "coverage2cytosine", "deduplicate_bismark"],
      'dirs': [],
-} 
+}
 
 moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/b/Bison/Bison-2.7-goolf-1.5.14.eb b/easybuild/easyconfigs/b/Bison/Bison-2.7-goolf-1.5.14.eb
index de2474fb3b4..4c523b02e61 100644
--- a/easybuild/easyconfigs/b/Bison/Bison-2.7-goolf-1.5.14.eb
+++ b/easybuild/easyconfigs/b/Bison/Bison-2.7-goolf-1.5.14.eb
@@ -7,7 +7,7 @@ homepage = 'http://www.gnu.org/software/bison'
 description = """Bison is a general-purpose parser generator that converts an annotated context-free grammar
 into a deterministic LR or generalized LR (GLR) parser employing LALR(1) parser tables."""
 
-toolchain = {'name': 'goolf', 'version': '1.5.14'} 
+toolchain = {'name': 'goolf', 'version': '1.5.14'}
 
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = [GNU_SOURCE]
diff --git a/easybuild/easyconfigs/b/BitSeq/BitSeq-0.7.0-goolf-1.4.10.eb b/easybuild/easyconfigs/b/BitSeq/BitSeq-0.7.0-goolf-1.4.10.eb
index 82b02fc155d..28b4adc0bdb 100644
--- a/easybuild/easyconfigs/b/BitSeq/BitSeq-0.7.0-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/b/BitSeq/BitSeq-0.7.0-goolf-1.4.10.eb
@@ -24,7 +24,7 @@ sources = [SOURCE_TAR_GZ]
 # put here the list of generated executables when compiling
 list_of_executables = ["convertSamples", "estimateDE", "estimateExpression", "estimateHyperPar",
         "estimateVBExpression", "extractSamples", "getFoldChange", "getGeneExpression",
-        "getPPLR", "getVariance", "getWithinGeneExpression", "parseAlignment", 
+        "getPPLR", "getVariance", "getWithinGeneExpression", "parseAlignment",
         "transposeLargeFile", "getCounts.py", "extractTranscriptInfo.py"]
 
 # this is the real EasyBuild line to copy all the executables to "bin"
diff --git a/easybuild/easyconfigs/b/Boost/Boost-1.55.0-foss-2015a-Python-2.7.9.eb b/easybuild/easyconfigs/b/Boost/Boost-1.55.0-foss-2015a-Python-2.7.9.eb
index 88a81a73e9b..54a936cee57 100644
--- a/easybuild/easyconfigs/b/Boost/Boost-1.55.0-foss-2015a-Python-2.7.9.eb
+++ b/easybuild/easyconfigs/b/Boost/Boost-1.55.0-foss-2015a-Python-2.7.9.eb
@@ -4,7 +4,7 @@ version = '1.55.0'
 homepage = 'http://www.boost.org/'
 description = """Boost provides free peer-reviewed portable C++ source libraries."""
 
-toolchain = {'name': 'foss', 'version': '2015a'} 
+toolchain = {'name': 'foss', 'version': '2015a'}
 toolchainopts = {'pic': True, 'usempi': True}
 
 source_urls = [SOURCEFORGE_SOURCE]
diff --git a/easybuild/easyconfigs/b/Boost/Boost-1.55.0-intel-2015a-Python-2.7.8.eb b/easybuild/easyconfigs/b/Boost/Boost-1.55.0-intel-2015a-Python-2.7.8.eb
index 39ae5a52a46..4646d38d216 100644
--- a/easybuild/easyconfigs/b/Boost/Boost-1.55.0-intel-2015a-Python-2.7.8.eb
+++ b/easybuild/easyconfigs/b/Boost/Boost-1.55.0-intel-2015a-Python-2.7.8.eb
@@ -4,7 +4,7 @@ version = '1.55.0'
 homepage = 'http://www.boost.org/'
 description = """Boost provides free peer-reviewed portable C++ source libraries."""
 
-toolchain = {'name': 'intel', 'version': '2015a'} 
+toolchain = {'name': 'intel', 'version': '2015a'}
 toolchainopts = {'pic': True, 'usempi': True}
 
 source_urls = [SOURCEFORGE_SOURCE]
diff --git a/easybuild/easyconfigs/b/Boost/Boost-1.57.0-foss-2015a-Python-2.7.9.eb b/easybuild/easyconfigs/b/Boost/Boost-1.57.0-foss-2015a-Python-2.7.9.eb
index 1c2ebd212d9..944128c6d51 100644
--- a/easybuild/easyconfigs/b/Boost/Boost-1.57.0-foss-2015a-Python-2.7.9.eb
+++ b/easybuild/easyconfigs/b/Boost/Boost-1.57.0-foss-2015a-Python-2.7.9.eb
@@ -4,7 +4,7 @@ version = '1.57.0'
 homepage = 'http://www.boost.org/'
 description = """Boost provides free peer-reviewed portable C++ source libraries."""
 
-toolchain = {'name': 'foss', 'version': '2015a'} 
+toolchain = {'name': 'foss', 'version': '2015a'}
 toolchainopts = {'pic': True, 'usempi': True}
 
 source_urls = [SOURCEFORGE_SOURCE]
diff --git a/easybuild/easyconfigs/b/Boost/Boost-1.57.0-intel-2015a-Python-2.7.9.eb b/easybuild/easyconfigs/b/Boost/Boost-1.57.0-intel-2015a-Python-2.7.9.eb
index 84fbb7d38c9..cf98c58fdf7 100644
--- a/easybuild/easyconfigs/b/Boost/Boost-1.57.0-intel-2015a-Python-2.7.9.eb
+++ b/easybuild/easyconfigs/b/Boost/Boost-1.57.0-intel-2015a-Python-2.7.9.eb
@@ -4,7 +4,7 @@ version = '1.57.0'
 homepage = 'http://www.boost.org/'
 description = """Boost provides free peer-reviewed portable C++ source libraries."""
 
-toolchain = {'name': 'intel', 'version': '2015a'} 
+toolchain = {'name': 'intel', 'version': '2015a'}
 toolchainopts = {'pic': True, 'usempi': True}
 
 source_urls = [SOURCEFORGE_SOURCE]
diff --git a/easybuild/easyconfigs/b/Boost/Boost-1.58.0-foss-2015a-Python-2.7.9.eb b/easybuild/easyconfigs/b/Boost/Boost-1.58.0-foss-2015a-Python-2.7.9.eb
index bbef8b760b3..02c7922f8dd 100644
--- a/easybuild/easyconfigs/b/Boost/Boost-1.58.0-foss-2015a-Python-2.7.9.eb
+++ b/easybuild/easyconfigs/b/Boost/Boost-1.58.0-foss-2015a-Python-2.7.9.eb
@@ -4,7 +4,7 @@ version = '1.58.0'
 homepage = 'http://www.boost.org/'
 description = """Boost provides free peer-reviewed portable C++ source libraries."""
 
-toolchain = {'name': 'foss', 'version': '2015a'} 
+toolchain = {'name': 'foss', 'version': '2015a'}
 toolchainopts = {'pic': True, 'usempi': True}
 
 source_urls = [SOURCEFORGE_SOURCE]
diff --git a/easybuild/easyconfigs/b/Boost/Boost-1.58.0-intel-2015a-Python-2.7.9.eb b/easybuild/easyconfigs/b/Boost/Boost-1.58.0-intel-2015a-Python-2.7.9.eb
index a209577bba5..9d905a95e3c 100644
--- a/easybuild/easyconfigs/b/Boost/Boost-1.58.0-intel-2015a-Python-2.7.9.eb
+++ b/easybuild/easyconfigs/b/Boost/Boost-1.58.0-intel-2015a-Python-2.7.9.eb
@@ -4,7 +4,7 @@ version = '1.58.0'
 homepage = 'http://www.boost.org/'
 description = """Boost provides free peer-reviewed portable C++ source libraries."""
 
-toolchain = {'name': 'intel', 'version': '2015a'} 
+toolchain = {'name': 'intel', 'version': '2015a'}
 toolchainopts = {'pic': True, 'usempi': True}
 
 source_urls = [SOURCEFORGE_SOURCE]
diff --git a/easybuild/easyconfigs/b/bbftpPRO/bbftpPRO-9.3.1-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/b/bbftpPRO/bbftpPRO-9.3.1-goalf-1.1.0-no-OFED.eb
index 7f34d186836..ead21fe6c82 100644
--- a/easybuild/easyconfigs/b/bbftpPRO/bbftpPRO-9.3.1-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/b/bbftpPRO/bbftpPRO-9.3.1-goalf-1.1.0-no-OFED.eb
@@ -24,7 +24,7 @@ toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
 sources = [SOURCE_TAR_BZ2]
 source_urls = ['http://bbftppro.myftp.org/']
 
-unpack_options = '--strip-components=1' # we need to dive one level deep inside the tarball 
+unpack_options = '--strip-components=1' # we need to dive one level deep inside the tarball
 
 start_dir = 'bbftpc'
 
diff --git a/easybuild/easyconfigs/b/bbftpPRO/bbftpPRO-9.3.1-goolf-1.4.10.eb b/easybuild/easyconfigs/b/bbftpPRO/bbftpPRO-9.3.1-goolf-1.4.10.eb
index 8017f38954a..944cb25b8bd 100644
--- a/easybuild/easyconfigs/b/bbftpPRO/bbftpPRO-9.3.1-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/b/bbftpPRO/bbftpPRO-9.3.1-goolf-1.4.10.eb
@@ -24,7 +24,7 @@ toolchain = {'name': 'goolf', 'version': '1.4.10'}
 sources = [SOURCE_TAR_BZ2]
 source_urls = ['http://bbftppro.myftp.org/']
 
-unpack_options = '--strip-components=1' # we need to dive one level deep inside the tarball 
+unpack_options = '--strip-components=1' # we need to dive one level deep inside the tarball
 
 start_dir = 'bbftpc'
 
diff --git a/easybuild/easyconfigs/b/bbftpPRO/bbftpPRO-9.3.1-ictce-5.3.0.eb b/easybuild/easyconfigs/b/bbftpPRO/bbftpPRO-9.3.1-ictce-5.3.0.eb
index cf3d332d4be..8cff88ba262 100644
--- a/easybuild/easyconfigs/b/bbftpPRO/bbftpPRO-9.3.1-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/b/bbftpPRO/bbftpPRO-9.3.1-ictce-5.3.0.eb
@@ -24,7 +24,7 @@ toolchain = {'name': 'ictce', 'version': '5.3.0'}
 sources = [SOURCE_TAR_BZ2]
 source_urls = ['http://bbftppro.myftp.org/']
 
-unpack_options = '--strip-components=1' # we need to dive one level deep inside the tarball 
+unpack_options = '--strip-components=1' # we need to dive one level deep inside the tarball
 
 start_dir = 'bbftpc'
 
diff --git a/easybuild/easyconfigs/b/binutils/binutils-2.22-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/b/binutils/binutils-2.22-goalf-1.1.0-no-OFED.eb
index 09be4e25138..89688dc6f16 100644
--- a/easybuild/easyconfigs/b/binutils/binutils-2.22-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/b/binutils/binutils-2.22-goalf-1.1.0-no-OFED.eb
@@ -30,7 +30,7 @@ configopts = '--with-sysroot=/'
 binlist = ['addr2line', 'ar', 'as', 'c++filt', 'elfedit', 'gprof', 'ld', 'ld.bfd', 'nm',
            'objcopy', 'objdump', 'ranlib', 'readelf', 'size', 'strings', 'strip' ]
 sanity_check_paths = {
-    'files': ['bin/%s' % x for x in binlist] + ['lib/libbfd.a', 'lib/libopcodes.a', 'lib64/libiberty.a'] + 
+    'files': ['bin/%s' % x for x in binlist] + ['lib/libbfd.a', 'lib/libopcodes.a', 'lib64/libiberty.a'] +
              ['include/%s' % x for x in ['ansidecl.h', 'bfd.h', 'bfdlink.h', 'dis-asm.h', 'symcat.h']],
     'dirs': [],
 }
diff --git a/easybuild/easyconfigs/b/binutils/binutils-2.22-gompi-1.4.12-no-OFED.eb b/easybuild/easyconfigs/b/binutils/binutils-2.22-gompi-1.4.12-no-OFED.eb
index 037eea64d67..fc3ab9230d4 100644
--- a/easybuild/easyconfigs/b/binutils/binutils-2.22-gompi-1.4.12-no-OFED.eb
+++ b/easybuild/easyconfigs/b/binutils/binutils-2.22-gompi-1.4.12-no-OFED.eb
@@ -30,7 +30,7 @@ configopts = '--with-sysroot=/'
 binlist = ['addr2line', 'ar', 'as', 'c++filt', 'elfedit', 'gprof', 'ld', 'ld.bfd', 'nm',
            'objcopy', 'objdump', 'ranlib', 'readelf', 'size', 'strings', 'strip' ]
 sanity_check_paths = {
-    'files': ['bin/%s' % x for x in binlist] + ['lib/libbfd.a', 'lib/libopcodes.a', 'lib64/libiberty.a'] + 
+    'files': ['bin/%s' % x for x in binlist] + ['lib/libbfd.a', 'lib/libopcodes.a', 'lib64/libiberty.a'] +
              ['include/%s' % x for x in ['ansidecl.h', 'bfd.h', 'bfdlink.h', 'dis-asm.h', 'symcat.h']],
     'dirs': [],
 }
diff --git a/easybuild/easyconfigs/b/binutils/binutils-2.22-goolf-1.4.10.eb b/easybuild/easyconfigs/b/binutils/binutils-2.22-goolf-1.4.10.eb
index 6eefeecf7f1..10612dc9735 100644
--- a/easybuild/easyconfigs/b/binutils/binutils-2.22-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/b/binutils/binutils-2.22-goolf-1.4.10.eb
@@ -29,7 +29,7 @@ configopts = '--with-sysroot=/'
 binlist = ['addr2line', 'ar', 'as', 'c++filt', 'elfedit', 'gprof', 'ld', 'ld.bfd', 'nm',
            'objcopy', 'objdump', 'ranlib', 'readelf', 'size', 'strings', 'strip' ]
 sanity_check_paths = {
-    'files': ['bin/%s' % x for x in binlist] + ['lib/libbfd.a', 'lib/libopcodes.a', 'lib64/libiberty.a'] + 
+    'files': ['bin/%s' % x for x in binlist] + ['lib/libbfd.a', 'lib/libopcodes.a', 'lib64/libiberty.a'] +
              ['include/%s' % x for x in ['ansidecl.h', 'bfd.h', 'bfdlink.h', 'dis-asm.h', 'symcat.h']],
     'dirs': [],
 }
diff --git a/easybuild/easyconfigs/b/binutils/binutils-2.22-goolf-1.5.14.eb b/easybuild/easyconfigs/b/binutils/binutils-2.22-goolf-1.5.14.eb
index 1922cb5d127..f0f82557eb0 100644
--- a/easybuild/easyconfigs/b/binutils/binutils-2.22-goolf-1.5.14.eb
+++ b/easybuild/easyconfigs/b/binutils/binutils-2.22-goolf-1.5.14.eb
@@ -27,7 +27,7 @@ source_urls = [GNU_SOURCE]
 binlist = ['addr2line', 'ar', 'as', 'c++filt', 'elfedit', 'gprof', 'ld', 'ld.bfd', 'nm',
            'objcopy', 'objdump', 'ranlib', 'readelf', 'size', 'strings', 'strip' ]
 sanity_check_paths = {
-    'files': ['bin/%s' % x for x in binlist] + ['lib/libbfd.a', 'lib/libopcodes.a', 'lib64/libiberty.a'] + 
+    'files': ['bin/%s' % x for x in binlist] + ['lib/libbfd.a', 'lib/libopcodes.a', 'lib64/libiberty.a'] +
              ['include/%s' % x for x in ['ansidecl.h', 'bfd.h', 'bfdlink.h', 'dis-asm.h', 'symcat.h']],
     'dirs': [],
 }
diff --git a/easybuild/easyconfigs/c/CD-HIT/CD-HIT-4.6.4-GNU-4.9.3-2.25-2015-0603.eb b/easybuild/easyconfigs/c/CD-HIT/CD-HIT-4.6.4-GNU-4.9.3-2.25-2015-0603.eb
index 0b72980db3e..b3d2485ff06 100644
--- a/easybuild/easyconfigs/c/CD-HIT/CD-HIT-4.6.4-GNU-4.9.3-2.25-2015-0603.eb
+++ b/easybuild/easyconfigs/c/CD-HIT/CD-HIT-4.6.4-GNU-4.9.3-2.25-2015-0603.eb
@@ -29,7 +29,7 @@ list_of_executables = ["cd-hit", "cd-hit-est", "cd-hit-2d", "cd-hit-est-2d", "cd
 # this is the real EasyBuild line to copy all the executables and perl scripts to "bin"
 files_to_copy = [
     (list_of_executables, "bin"),
-    (["*.pl"], 'bin'), 
+    (["*.pl"], 'bin'),
     (["psi-cd-hit/*.pl"], 'bin'),
     "README",
     "doc",
diff --git a/easybuild/easyconfigs/c/CLHEP/CLHEP-2.1.3.1-intel-2015a.eb b/easybuild/easyconfigs/c/CLHEP/CLHEP-2.1.3.1-intel-2015a.eb
index 054982e2e28..0e9493dbb41 100644
--- a/easybuild/easyconfigs/c/CLHEP/CLHEP-2.1.3.1-intel-2015a.eb
+++ b/easybuild/easyconfigs/c/CLHEP/CLHEP-2.1.3.1-intel-2015a.eb
@@ -19,6 +19,6 @@ builddependencies = [('CMake', '3.1.3')]
 
 separate_build_dir = True
 
-configopts = '-DCMAKE_BUILD_TYPE=Release' 
+configopts = '-DCMAKE_BUILD_TYPE=Release'
 
 moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/c/CMake/CMake-2.8.12-ictce-7.1.2.eb b/easybuild/easyconfigs/c/CMake/CMake-2.8.12-ictce-7.1.2.eb
index 48bd8377090..97f1c880539 100644
--- a/easybuild/easyconfigs/c/CMake/CMake-2.8.12-ictce-7.1.2.eb
+++ b/easybuild/easyconfigs/c/CMake/CMake-2.8.12-ictce-7.1.2.eb
@@ -7,7 +7,7 @@ homepage = 'http://www.cmake.org'
 description = """CMake, the cross-platform, open-source build system.
  CMake is a family of tools designed to build, test and package software."""
 
-toolchain = {'name': 'ictce', 'version': '7.1.2'} 
+toolchain = {'name': 'ictce', 'version': '7.1.2'}
 
 source_urls = ['http://www.cmake.org/files/v%(version_major_minor)s']
 sources = [SOURCELOWER_TAR_GZ]
diff --git a/easybuild/easyconfigs/c/CMake/CMake-2.8.12-intel-2014b.eb b/easybuild/easyconfigs/c/CMake/CMake-2.8.12-intel-2014b.eb
index 7749fdcd028..93127430ded 100644
--- a/easybuild/easyconfigs/c/CMake/CMake-2.8.12-intel-2014b.eb
+++ b/easybuild/easyconfigs/c/CMake/CMake-2.8.12-intel-2014b.eb
@@ -7,7 +7,7 @@ homepage = 'http://www.cmake.org'
 description = """CMake, the cross-platform, open-source build system.
  CMake is a family of tools designed to build, test and package software."""
 
-toolchain = {'name': 'intel', 'version': '2014b'} 
+toolchain = {'name': 'intel', 'version': '2014b'}
 
 source_urls = ['http://www.cmake.org/files/v%(version_major_minor)s']
 sources = [SOURCELOWER_TAR_GZ]
diff --git a/easybuild/easyconfigs/c/ChIP-Seq/ChIP-Seq-1.5-1-goolf-1.4.10.eb b/easybuild/easyconfigs/c/ChIP-Seq/ChIP-Seq-1.5-1-goolf-1.4.10.eb
index 89d4bf64609..50c119c61c8 100644
--- a/easybuild/easyconfigs/c/ChIP-Seq/ChIP-Seq-1.5-1-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/c/ChIP-Seq/ChIP-Seq-1.5-1-goolf-1.4.10.eb
@@ -31,13 +31,13 @@ installopts += 'cp -a tools/ %(installdir)s && '
 installopts += 'cp -a README doc/ %(installdir)s'
 
 sanity_check_paths = {
-    'files': ["bin/%s" % x for x in ["chipcenter", "chipcor", "chipextract", "chippart", "chippeak", 
+    'files': ["bin/%s" % x for x in ["chipcenter", "chipcor", "chipextract", "chippart", "chippeak",
                                     "chipscore", "compactsga", "counts_filter", "countsga", "featreplace"]],
     'dirs': []
 }
 
 # add tools dir to PATH
-modextrapaths = { 
+modextrapaths = {
         'PATH': "tools",
 }
 
diff --git a/easybuild/easyconfigs/c/ChIP-Seq/ChIP-Seq-1.5-1-goolf-1.7.20.eb b/easybuild/easyconfigs/c/ChIP-Seq/ChIP-Seq-1.5-1-goolf-1.7.20.eb
index d273ae8dd85..a72566ad447 100644
--- a/easybuild/easyconfigs/c/ChIP-Seq/ChIP-Seq-1.5-1-goolf-1.7.20.eb
+++ b/easybuild/easyconfigs/c/ChIP-Seq/ChIP-Seq-1.5-1-goolf-1.7.20.eb
@@ -31,13 +31,13 @@ installopts += 'cp -a tools/ %(installdir)s && '
 installopts += 'cp -a README doc/ %(installdir)s'
 
 sanity_check_paths = {
-    'files': ["bin/%s" % x for x in ["chipcenter", "chipcor", "chipextract", "chippart", "chippeak", 
+    'files': ["bin/%s" % x for x in ["chipcenter", "chipcor", "chipextract", "chippart", "chippeak",
                                     "chipscore", "compactsga", "counts_filter", "countsga", "featreplace"]],
     'dirs': []
 }
 
 # add tools dir to PATH
-modextrapaths = { 
+modextrapaths = {
         'PATH': "tools",
 }
 
diff --git a/easybuild/easyconfigs/c/Clang/Clang-3.6.0-GCC-4.9.2.eb b/easybuild/easyconfigs/c/Clang/Clang-3.6.0-GCC-4.9.2.eb
index 40f0a86d6f8..9d5881c5250 100644
--- a/easybuild/easyconfigs/c/Clang/Clang-3.6.0-GCC-4.9.2.eb
+++ b/easybuild/easyconfigs/c/Clang/Clang-3.6.0-GCC-4.9.2.eb
@@ -32,7 +32,7 @@ sources = [
 dependencies = [
     ('GMP', '6.0.0a'),
     ('ISL', '0.14'),
-] 
+]
 
 builddependencies = [
     ('CMake', '3.1.3'),
diff --git a/easybuild/easyconfigs/c/Clang/Clang-3.6.1-GCC-4.9.2.eb b/easybuild/easyconfigs/c/Clang/Clang-3.6.1-GCC-4.9.2.eb
index 966759d71cd..bb31f282f68 100644
--- a/easybuild/easyconfigs/c/Clang/Clang-3.6.1-GCC-4.9.2.eb
+++ b/easybuild/easyconfigs/c/Clang/Clang-3.6.1-GCC-4.9.2.eb
@@ -32,7 +32,7 @@ sources = [
 dependencies = [
     ('GMP', '6.0.0a'),
     ('ISL', '0.14'),
-] 
+]
 
 builddependencies = [
     ('CMake', '3.2.1'),
diff --git a/easybuild/easyconfigs/c/Clang/Clang-3.7.0-GNU-4.9.3-2.25.eb b/easybuild/easyconfigs/c/Clang/Clang-3.7.0-GNU-4.9.3-2.25.eb
index 94e343f08b4..a76712524b4 100644
--- a/easybuild/easyconfigs/c/Clang/Clang-3.7.0-GNU-4.9.3-2.25.eb
+++ b/easybuild/easyconfigs/c/Clang/Clang-3.7.0-GNU-4.9.3-2.25.eb
@@ -32,7 +32,7 @@ sources = [
 dependencies = [
     ('GMP', '6.0.0a'),
     ('ISL', '0.15'),
-] 
+]
 
 builddependencies = [
     ('CMake', '3.3.2'),
diff --git a/easybuild/easyconfigs/c/Clang/Clang-3.7.1-GCC-4.9.3-2.25.eb b/easybuild/easyconfigs/c/Clang/Clang-3.7.1-GCC-4.9.3-2.25.eb
index 5f5f6f2ed37..ee437ef2f24 100644
--- a/easybuild/easyconfigs/c/Clang/Clang-3.7.1-GCC-4.9.3-2.25.eb
+++ b/easybuild/easyconfigs/c/Clang/Clang-3.7.1-GCC-4.9.3-2.25.eb
@@ -32,7 +32,7 @@ sources = [
 dependencies = [
     ('GMP', '6.1.0'),
     ('ISL', '0.15'),
-] 
+]
 
 builddependencies = [
     ('CMake', '3.4.1', '', ('GCCcore', '4.9.3')),
diff --git a/easybuild/easyconfigs/c/Cufflinks/Cufflinks-1.3.0-goolf-1.4.10.eb b/easybuild/easyconfigs/c/Cufflinks/Cufflinks-1.3.0-goolf-1.4.10.eb
index 95405d7ce3a..501824903b4 100644
--- a/easybuild/easyconfigs/c/Cufflinks/Cufflinks-1.3.0-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/c/Cufflinks/Cufflinks-1.3.0-goolf-1.4.10.eb
@@ -11,7 +11,7 @@
 ##
 
 name = 'Cufflinks'
-version = "1.3.0" 
+version = "1.3.0"
 
 homepage = 'http://cole-trapnell-lab.github.io/cufflinks/'
 description = """Transcript assembly, differential expression, and differential regulation for RNA-Seq"""
@@ -30,7 +30,7 @@ dependencies = [
 ]
 
 patches = [
-    'Cufflinks_GCC-4.7.patch', 
+    'Cufflinks_GCC-4.7.patch',
     'cufflinks-1.x-ldflags.patch'
 ]
 
diff --git a/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.3.1-goolf-1.5.14.eb b/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.3.1-goolf-1.5.14.eb
index 14b0fa75831..2e87b89a364 100644
--- a/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.3.1-goolf-1.5.14.eb
+++ b/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.3.1-goolf-1.5.14.eb
@@ -5,7 +5,7 @@ homepage = 'http://www.doxygen.org'
 description = """Doxygen is a documentation system for C++, C, Java, Objective-C, Python, 
  IDL (Corba and Microsoft flavors), Fortran, VHDL, PHP, C#, and to some extent D."""
 
-toolchain = {'name': 'goolf', 'version': '1.5.14'} 
+toolchain = {'name': 'goolf', 'version': '1.5.14'}
 
 sources = ['%(namelower)s-%(version)s.src.tar.gz']
 source_urls = ['http://ftp.stack.nl/pub/users/dimitri/']
diff --git a/easybuild/easyconfigs/e/ELPA/ELPA-2013.11-ictce-5.3.0.eb b/easybuild/easyconfigs/e/ELPA/ELPA-2013.11-ictce-5.3.0.eb
index 6294e116566..89cd537fc7b 100644
--- a/easybuild/easyconfigs/e/ELPA/ELPA-2013.11-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/e/ELPA/ELPA-2013.11-ictce-5.3.0.eb
@@ -15,7 +15,7 @@ version = '2013.11'
 homepage = 'http://elpa.rzg.mpg.de'
 description = """Eigenvalue SoLvers for Petaflop-Applications ."""
 
-toolchain = {'name': 'ictce', 'version': '5.3.0'} 
+toolchain = {'name': 'ictce', 'version': '5.3.0'}
 toolchainopts = {'optarch': True, 'usempi': True}
 
 # download at http://elpa.rzg.mpg.de/elpa-tar-archive
diff --git a/easybuild/easyconfigs/e/ELPA/ELPA-2013.11-ictce-5.5.0.eb b/easybuild/easyconfigs/e/ELPA/ELPA-2013.11-ictce-5.5.0.eb
index c080908b429..bbbc8c56b4e 100644
--- a/easybuild/easyconfigs/e/ELPA/ELPA-2013.11-ictce-5.5.0.eb
+++ b/easybuild/easyconfigs/e/ELPA/ELPA-2013.11-ictce-5.5.0.eb
@@ -15,7 +15,7 @@ version = '2013.11'
 homepage = 'http://elpa.rzg.mpg.de'
 description = """Eigenvalue SoLvers for Petaflop-Applications ."""
 
-toolchain = {'name': 'ictce', 'version': '5.5.0'} 
+toolchain = {'name': 'ictce', 'version': '5.5.0'}
 toolchainopts = {'optarch': True, 'usempi': True}
 
 # download at http://elpa.rzg.mpg.de/elpa-tar-archive
diff --git a/easybuild/easyconfigs/e/ELPH/ELPH-1.0.1-goolf-1.4.10.eb b/easybuild/easyconfigs/e/ELPH/ELPH-1.0.1-goolf-1.4.10.eb
index 85c2d23a0ee..5403f1fde92 100644
--- a/easybuild/easyconfigs/e/ELPH/ELPH-1.0.1-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/e/ELPH/ELPH-1.0.1-goolf-1.4.10.eb
@@ -26,7 +26,7 @@ buildopts = ' CC="$CC"'
 
 parallel = 1
 
-files_to_copy = [ (["elph"], "bin"), "COPYRIGHT", "LICENSE", "Readme.ELPH", "VERSION" ] 
+files_to_copy = [ (["elph"], "bin"), "COPYRIGHT", "LICENSE", "Readme.ELPH", "VERSION" ]
 
 sanity_check_paths = {
     'files': ["bin/elph"],
diff --git a/easybuild/easyconfigs/e/ELPH/ELPH-1.0.1-ictce-6.2.5.eb b/easybuild/easyconfigs/e/ELPH/ELPH-1.0.1-ictce-6.2.5.eb
index a6057c15fd1..8986e972004 100644
--- a/easybuild/easyconfigs/e/ELPH/ELPH-1.0.1-ictce-6.2.5.eb
+++ b/easybuild/easyconfigs/e/ELPH/ELPH-1.0.1-ictce-6.2.5.eb
@@ -26,7 +26,7 @@ buildopts = ' CC="$CC"'
 
 parallel = 1
 
-files_to_copy = [ (["elph"], "bin"), "COPYRIGHT", "LICENSE", "Readme.ELPH", "VERSION" ] 
+files_to_copy = [ (["elph"], "bin"), "COPYRIGHT", "LICENSE", "Readme.ELPH", "VERSION" ]
 
 sanity_check_paths = {
     'files': ["bin/elph"],
diff --git a/easybuild/easyconfigs/e/EMBOSS/EMBOSS-6.5.7-goolf-1.4.10.eb b/easybuild/easyconfigs/e/EMBOSS/EMBOSS-6.5.7-goolf-1.4.10.eb
index ae4e3793e60..c8367acc348 100644
--- a/easybuild/easyconfigs/e/EMBOSS/EMBOSS-6.5.7-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/e/EMBOSS/EMBOSS-6.5.7-goolf-1.4.10.eb
@@ -31,7 +31,7 @@ configopts = " --with-hpdf=$EBROOTLIBHARU "
 parallel = 1
 
 sanity_check_paths = {
-    'files': ['bin/%s' % x for x in ['seqret', 'aligncopy', 'profit', 'prophet']] + 
+    'files': ['bin/%s' % x for x in ['seqret', 'aligncopy', 'profit', 'prophet']] +
              ['lib/lib%s.a' % x for x in ['acd', 'ajax', 'ajaxdb', 'ajaxg', 'eexpat', 'ensembl',
                                           'epcre', 'eplplot', 'ezlib', 'nucleus']] +
              ['share/EMBOSS/jemboss/lib/jemboss.jar'],
diff --git a/easybuild/easyconfigs/e/EMBOSS/EMBOSS-6.5.7-ictce-4.1.13.eb b/easybuild/easyconfigs/e/EMBOSS/EMBOSS-6.5.7-ictce-4.1.13.eb
index f3660e8c902..7100e7cae91 100644
--- a/easybuild/easyconfigs/e/EMBOSS/EMBOSS-6.5.7-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/e/EMBOSS/EMBOSS-6.5.7-ictce-4.1.13.eb
@@ -31,7 +31,7 @@ configopts = " --with-hpdf=$EBROOTLIBHARU "
 parallel = 1
 
 sanity_check_paths = {
-    'files': ['bin/%s' % x for x in ['seqret', 'aligncopy', 'profit', 'prophet']] + 
+    'files': ['bin/%s' % x for x in ['seqret', 'aligncopy', 'profit', 'prophet']] +
              ['lib/lib%s.a' % x for x in ['acd', 'ajax', 'ajaxdb', 'ajaxg', 'eexpat', 'ensembl',
                                           'epcre', 'eplplot', 'ezlib', 'nucleus']] +
              ['share/EMBOSS/jemboss/lib/jemboss.jar'],
diff --git a/easybuild/easyconfigs/e/EMBOSS/EMBOSS-6.5.7-ictce-5.3.0.eb b/easybuild/easyconfigs/e/EMBOSS/EMBOSS-6.5.7-ictce-5.3.0.eb
index f34568c0376..88380bcbaba 100644
--- a/easybuild/easyconfigs/e/EMBOSS/EMBOSS-6.5.7-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/e/EMBOSS/EMBOSS-6.5.7-ictce-5.3.0.eb
@@ -31,7 +31,7 @@ configopts = " --with-hpdf=$EBROOTLIBHARU "
 parallel = 1
 
 sanity_check_paths = {
-    'files': ['bin/%s' % x for x in ['seqret', 'aligncopy', 'profit', 'prophet']] + 
+    'files': ['bin/%s' % x for x in ['seqret', 'aligncopy', 'profit', 'prophet']] +
              ['lib/lib%s.a' % x for x in ['acd', 'ajax', 'ajaxdb', 'ajaxg', 'eexpat', 'ensembl',
                                           'epcre', 'eplplot', 'ezlib', 'nucleus']] +
              ['share/EMBOSS/jemboss/lib/jemboss.jar'],
diff --git a/easybuild/easyconfigs/e/ETSF_IO/ETSF_IO-1.0.4-goolf-1.4.10.eb b/easybuild/easyconfigs/e/ETSF_IO/ETSF_IO-1.0.4-goolf-1.4.10.eb
index f270612d5f3..9ec46d296fb 100644
--- a/easybuild/easyconfigs/e/ETSF_IO/ETSF_IO-1.0.4-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/e/ETSF_IO/ETSF_IO-1.0.4-goolf-1.4.10.eb
@@ -27,7 +27,7 @@ configopts += " --with-netcdf-incs='-I$EBROOTNETCDF/include'"
 dependencies = [ ('netCDF', '4.1.3') ]
 
 sanity_check_paths = {
-    'files': ["bin/etsf_io"], 
+    'files': ["bin/etsf_io"],
     'dirs': []
 }
 
diff --git a/easybuild/easyconfigs/e/Emacs/Emacs-24.3-GCC-4.8.3-bare.eb b/easybuild/easyconfigs/e/Emacs/Emacs-24.3-GCC-4.8.3-bare.eb
index 68f945c239d..8e47359be16 100644
--- a/easybuild/easyconfigs/e/Emacs/Emacs-24.3-GCC-4.8.3-bare.eb
+++ b/easybuild/easyconfigs/e/Emacs/Emacs-24.3-GCC-4.8.3-bare.eb
@@ -10,7 +10,7 @@ description = """GNU Emacs is an extensible, customizable text editor—and more
  with extensions to support text editing."""
 
 toolchain = {'name': 'GCC', 'version': '4.8.3'}
-toolchainopts = {} 
+toolchainopts = {}
 
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = [GNU_SOURCE]
diff --git a/easybuild/easyconfigs/e/Emacs/Emacs-24.3-GCC-4.8.3.eb b/easybuild/easyconfigs/e/Emacs/Emacs-24.3-GCC-4.8.3.eb
index cb835bb8cdd..485bc706648 100644
--- a/easybuild/easyconfigs/e/Emacs/Emacs-24.3-GCC-4.8.3.eb
+++ b/easybuild/easyconfigs/e/Emacs/Emacs-24.3-GCC-4.8.3.eb
@@ -9,7 +9,7 @@ description = """GNU Emacs is an extensible, customizable text editor—and more
  with extensions to support text editing."""
 
 toolchain = {'name': 'GCC', 'version': '4.8.3'}
-toolchainopts = {} 
+toolchainopts = {}
 
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = [GNU_SOURCE]
diff --git a/easybuild/easyconfigs/e/ErlangOTP/ErlangOTP-R16B02-GCC-4.7.2-no-Java.eb b/easybuild/easyconfigs/e/ErlangOTP/ErlangOTP-R16B02-GCC-4.7.2-no-Java.eb
index 4e009be5c9a..570e7eb37f8 100644
--- a/easybuild/easyconfigs/e/ErlangOTP/ErlangOTP-R16B02-GCC-4.7.2-no-Java.eb
+++ b/easybuild/easyconfigs/e/ErlangOTP/ErlangOTP-R16B02-GCC-4.7.2-no-Java.eb
@@ -16,7 +16,7 @@ configopts = '--without-javac '
 
 sanity_check_paths = {
     'files': ['bin/erl'],
-    'dirs': ['lib/erlang/bin', 'lib/erlang/lib'], 
+    'dirs': ['lib/erlang/bin', 'lib/erlang/lib'],
 }
 
 moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/f/FASTX-Toolkit/FASTX-Toolkit-0.0.13.2-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/f/FASTX-Toolkit/FASTX-Toolkit-0.0.13.2-goalf-1.1.0-no-OFED.eb
index ce824a5e567..2fa88fc7e06 100644
--- a/easybuild/easyconfigs/f/FASTX-Toolkit/FASTX-Toolkit-0.0.13.2-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/f/FASTX-Toolkit/FASTX-Toolkit-0.0.13.2-goalf-1.1.0-no-OFED.eb
@@ -33,7 +33,7 @@ sanity_check_paths = {
                                                              'artifacts_filter', 'reverse_complement',
                                                              'collapser', 'uncollapser', 'renamer',
                                                              'barcode_splitter.pl', 'nucleotide_distribution_graph.sh',
-                                                             'nucleotide_distribution_line_graph.sh']] + 
+                                                             'nucleotide_distribution_line_graph.sh']] +
                                ['bin/fasta_%s' % x for x in ['clipping_histogram.pl', 'formatter',
                                                              'nucleotide_changer']] +
                                ['bin/fastq_%s' % x for x in ['quality_boxplot_graph.sh', 'quality_converter',
diff --git a/easybuild/easyconfigs/f/FASTX-Toolkit/FASTX-Toolkit-0.0.13.2-goolf-1.4.10.eb b/easybuild/easyconfigs/f/FASTX-Toolkit/FASTX-Toolkit-0.0.13.2-goolf-1.4.10.eb
index d68850c2976..b2711aa2a6d 100644
--- a/easybuild/easyconfigs/f/FASTX-Toolkit/FASTX-Toolkit-0.0.13.2-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/f/FASTX-Toolkit/FASTX-Toolkit-0.0.13.2-goolf-1.4.10.eb
@@ -33,7 +33,7 @@ sanity_check_paths = {
                                                              'artifacts_filter', 'reverse_complement',
                                                              'collapser', 'uncollapser', 'renamer',
                                                              'barcode_splitter.pl', 'nucleotide_distribution_graph.sh',
-                                                             'nucleotide_distribution_line_graph.sh']] + 
+                                                             'nucleotide_distribution_line_graph.sh']] +
                                ['bin/fasta_%s' % x for x in ['clipping_histogram.pl', 'formatter',
                                                              'nucleotide_changer']] +
                                ['bin/fastq_%s' % x for x in ['quality_boxplot_graph.sh', 'quality_converter',
diff --git a/easybuild/easyconfigs/f/FASTX-Toolkit/FASTX-Toolkit-0.0.13.2-ictce-4.0.6.eb b/easybuild/easyconfigs/f/FASTX-Toolkit/FASTX-Toolkit-0.0.13.2-ictce-4.0.6.eb
index c0fdac7c353..aaddc8190a9 100644
--- a/easybuild/easyconfigs/f/FASTX-Toolkit/FASTX-Toolkit-0.0.13.2-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/f/FASTX-Toolkit/FASTX-Toolkit-0.0.13.2-ictce-4.0.6.eb
@@ -35,7 +35,7 @@ sanity_check_paths = {
                                                              'artifacts_filter', 'reverse_complement',
                                                              'collapser', 'uncollapser', 'renamer',
                                                              'barcode_splitter.pl', 'nucleotide_distribution_graph.sh',
-                                                             'nucleotide_distribution_line_graph.sh']] + 
+                                                             'nucleotide_distribution_line_graph.sh']] +
                                ['bin/fasta_%s' % x for x in ['clipping_histogram.pl', 'formatter',
                                                              'nucleotide_changer']] +
                                ['bin/fastq_%s' % x for x in ['quality_boxplot_graph.sh', 'quality_converter',
diff --git a/easybuild/easyconfigs/f/FASTX-Toolkit/FASTX-Toolkit-0.0.13.2-ictce-5.3.0.eb b/easybuild/easyconfigs/f/FASTX-Toolkit/FASTX-Toolkit-0.0.13.2-ictce-5.3.0.eb
index f7fa06667c0..02992118cc8 100644
--- a/easybuild/easyconfigs/f/FASTX-Toolkit/FASTX-Toolkit-0.0.13.2-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/f/FASTX-Toolkit/FASTX-Toolkit-0.0.13.2-ictce-5.3.0.eb
@@ -36,7 +36,7 @@ sanity_check_paths = {
                                                              'artifacts_filter', 'reverse_complement',
                                                              'collapser', 'uncollapser', 'renamer',
                                                              'barcode_splitter.pl', 'nucleotide_distribution_graph.sh',
-                                                             'nucleotide_distribution_line_graph.sh']] + 
+                                                             'nucleotide_distribution_line_graph.sh']] +
                                ['bin/fasta_%s' % x for x in ['clipping_histogram.pl', 'formatter',
                                                              'nucleotide_changer']] +
                                ['bin/fastq_%s' % x for x in ['quality_boxplot_graph.sh', 'quality_converter',
diff --git a/easybuild/easyconfigs/f/FASTX-Toolkit/FASTX-Toolkit-0.0.14-foss-2015b.eb b/easybuild/easyconfigs/f/FASTX-Toolkit/FASTX-Toolkit-0.0.14-foss-2015b.eb
index b4ea7cb7bad..46d174be2cc 100644
--- a/easybuild/easyconfigs/f/FASTX-Toolkit/FASTX-Toolkit-0.0.14-foss-2015b.eb
+++ b/easybuild/easyconfigs/f/FASTX-Toolkit/FASTX-Toolkit-0.0.14-foss-2015b.eb
@@ -28,15 +28,15 @@ sources = ['fastx_toolkit-%(version)s.tar.bz2']
 builddependencies = [('libgtextutils', '0.7')];
 
 sanity_check_paths = {
-    'files': 
-        ['bin/fastx_%s' % x for x in 
+    'files':
+        ['bin/fastx_%s' % x for x in
             ['clipper', 'trimmer', 'quality_stats', 'artifacts_filter', 'reverse_complement',
             'collapser', 'uncollapser', 'renamer', 'barcode_splitter.pl', 'nucleotide_distribution_graph.sh',
-            'nucleotide_distribution_line_graph.sh']] + 
-        ['bin/fasta_%s' % x for x in 
+            'nucleotide_distribution_line_graph.sh']] +
+        ['bin/fasta_%s' % x for x in
             ['clipping_histogram.pl', 'formatter', 'nucleotide_changer']] +
-        ['bin/fastq_%s' % x for x in 
-            ['quality_boxplot_graph.sh', 'quality_converter', 'to_fasta', 'quality_filter', 
+        ['bin/fastq_%s' % x for x in
+            ['quality_boxplot_graph.sh', 'quality_converter', 'to_fasta', 'quality_filter',
             'quality_trimmer', 'masker']],
     'dirs': ['.']
     }
diff --git a/easybuild/easyconfigs/f/FASTX-Toolkit/FASTX-Toolkit-0.0.14-goolf-1.4.10.eb b/easybuild/easyconfigs/f/FASTX-Toolkit/FASTX-Toolkit-0.0.14-goolf-1.4.10.eb
index 96c11292903..16426d67887 100644
--- a/easybuild/easyconfigs/f/FASTX-Toolkit/FASTX-Toolkit-0.0.14-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/f/FASTX-Toolkit/FASTX-Toolkit-0.0.14-goolf-1.4.10.eb
@@ -29,15 +29,15 @@ sources = ['%s-%%(version)s.tar.bz2' % altname]
 dependencies = [('libgtextutils', '0.6.1')];
 
 sanity_check_paths = {
-    'files': 
-        ['bin/fastx_%s' % x for x in 
+    'files':
+        ['bin/fastx_%s' % x for x in
             ['clipper', 'trimmer', 'quality_stats', 'artifacts_filter', 'reverse_complement',
             'collapser', 'uncollapser', 'renamer', 'barcode_splitter.pl', 'nucleotide_distribution_graph.sh',
-            'nucleotide_distribution_line_graph.sh']] + 
-        ['bin/fasta_%s' % x for x in 
+            'nucleotide_distribution_line_graph.sh']] +
+        ['bin/fasta_%s' % x for x in
             ['clipping_histogram.pl', 'formatter', 'nucleotide_changer']] +
-        ['bin/fastq_%s' % x for x in 
-            ['quality_boxplot_graph.sh', 'quality_converter', 'to_fasta', 'quality_filter', 
+        ['bin/fastq_%s' % x for x in
+            ['quality_boxplot_graph.sh', 'quality_converter', 'to_fasta', 'quality_filter',
             'quality_trimmer', 'masker']],
     'dirs': ['.']
     }
diff --git a/easybuild/easyconfigs/f/FASTX-Toolkit/FASTX-Toolkit-0.0.14-intel-2015a.eb b/easybuild/easyconfigs/f/FASTX-Toolkit/FASTX-Toolkit-0.0.14-intel-2015a.eb
index 13d9d1cb72c..18c56837a09 100644
--- a/easybuild/easyconfigs/f/FASTX-Toolkit/FASTX-Toolkit-0.0.14-intel-2015a.eb
+++ b/easybuild/easyconfigs/f/FASTX-Toolkit/FASTX-Toolkit-0.0.14-intel-2015a.eb
@@ -29,15 +29,15 @@ sources = ['%s-%%(version)s.tar.bz2' % altname]
 dependencies = [('libgtextutils', '0.6.1')];
 
 sanity_check_paths = {
-    'files': 
-        ['bin/fastx_%s' % x for x in 
+    'files':
+        ['bin/fastx_%s' % x for x in
             ['clipper', 'trimmer', 'quality_stats', 'artifacts_filter', 'reverse_complement',
             'collapser', 'uncollapser', 'renamer', 'barcode_splitter.pl', 'nucleotide_distribution_graph.sh',
-            'nucleotide_distribution_line_graph.sh']] + 
-        ['bin/fasta_%s' % x for x in 
+            'nucleotide_distribution_line_graph.sh']] +
+        ['bin/fasta_%s' % x for x in
             ['clipping_histogram.pl', 'formatter', 'nucleotide_changer']] +
-        ['bin/fastq_%s' % x for x in 
-            ['quality_boxplot_graph.sh', 'quality_converter', 'to_fasta', 'quality_filter', 
+        ['bin/fastq_%s' % x for x in
+            ['quality_boxplot_graph.sh', 'quality_converter', 'to_fasta', 'quality_filter',
             'quality_trimmer', 'masker']],
     'dirs': ['.']
     }
diff --git a/easybuild/easyconfigs/f/fastqz/fastqz-1.5-GCC-4.8.2.eb b/easybuild/easyconfigs/f/fastqz/fastqz-1.5-GCC-4.8.2.eb
index 902b240c049..4af4d1b872d 100644
--- a/easybuild/easyconfigs/f/fastqz/fastqz-1.5-GCC-4.8.2.eb
+++ b/easybuild/easyconfigs/f/fastqz/fastqz-1.5-GCC-4.8.2.eb
@@ -37,7 +37,7 @@ cmds_map = [
 files_to_copy = [(['fastqz', 'fapack'], 'bin')]
 
 sanity_check_paths = {
-    'files': ["bin/fastqz", "bin/fapack"], 
+    'files': ["bin/fastqz", "bin/fapack"],
     'dirs': []
 }
 
diff --git a/easybuild/easyconfigs/f/ffmpeg/ffmpeg-2.4-intel-2014.06.eb b/easybuild/easyconfigs/f/ffmpeg/ffmpeg-2.4-intel-2014.06.eb
index 36569d20af7..4abf658ad65 100644
--- a/easybuild/easyconfigs/f/ffmpeg/ffmpeg-2.4-intel-2014.06.eb
+++ b/easybuild/easyconfigs/f/ffmpeg/ffmpeg-2.4-intel-2014.06.eb
@@ -20,7 +20,7 @@ dependencies = [
 
 sanity_check_paths = {
     'files': ['bin/ff%s' % x for x in ['mpeg', 'probe', 'server'] ] +
-             ['lib/lib%s.%s' % (x, y) for x in ['avdevice', 'avfilter', 'avformat', 'avcodec', 'postproc', 
+             ['lib/lib%s.%s' % (x, y) for x in ['avdevice', 'avfilter', 'avformat', 'avcodec', 'postproc',
                                                 'swresample', 'swscale', 'avutil'] for y in ['so', 'a']],
     'dirs': ['include']
 }
diff --git a/easybuild/easyconfigs/f/ffmpeg/ffmpeg-2.4-intel-2014b.eb b/easybuild/easyconfigs/f/ffmpeg/ffmpeg-2.4-intel-2014b.eb
index a9bbbfc3c13..4461759fe7e 100644
--- a/easybuild/easyconfigs/f/ffmpeg/ffmpeg-2.4-intel-2014b.eb
+++ b/easybuild/easyconfigs/f/ffmpeg/ffmpeg-2.4-intel-2014b.eb
@@ -20,7 +20,7 @@ dependencies = [
 
 sanity_check_paths = {
     'files': ['bin/ff%s' % x for x in ['mpeg', 'probe', 'server'] ] +
-             ['lib/lib%s.%s' % (x, y) for x in ['avdevice', 'avfilter', 'avformat', 'avcodec', 'postproc', 
+             ['lib/lib%s.%s' % (x, y) for x in ['avdevice', 'avfilter', 'avformat', 'avcodec', 'postproc',
                                                 'swresample', 'swscale', 'avutil'] for y in ['so', 'a']],
     'dirs': ['include']
 }
diff --git a/easybuild/easyconfigs/f/flex/flex-2.5.37-goolf-1.5.14.eb b/easybuild/easyconfigs/f/flex/flex-2.5.37-goolf-1.5.14.eb
index 3f5206f66ce..852837bf5be 100644
--- a/easybuild/easyconfigs/f/flex/flex-2.5.37-goolf-1.5.14.eb
+++ b/easybuild/easyconfigs/f/flex/flex-2.5.37-goolf-1.5.14.eb
@@ -5,7 +5,7 @@ homepage = 'http://flex.sourceforge.net/'
 description = """Flex (Fast Lexical Analyzer) is a tool for generating scanners. A scanner, 
 sometimes called a tokenizer, is a program which recognizes lexical patterns in text."""
 
-toolchain = {'name': 'goolf', 'version': '1.5.14'} 
+toolchain = {'name': 'goolf', 'version': '1.5.14'}
 toolchainopts = {'pic': True}
 
 sources = [SOURCELOWER_TAR_GZ]
diff --git a/easybuild/easyconfigs/f/flex/flex-2.5.39-intel-para-2014.12.eb b/easybuild/easyconfigs/f/flex/flex-2.5.39-intel-para-2014.12.eb
index 469e32f3d73..7cd93ab5fc2 100644
--- a/easybuild/easyconfigs/f/flex/flex-2.5.39-intel-para-2014.12.eb
+++ b/easybuild/easyconfigs/f/flex/flex-2.5.39-intel-para-2014.12.eb
@@ -5,7 +5,7 @@ homepage = 'http://flex.sourceforge.net/'
 description = """Flex (Fast Lexical Analyzer) is a tool for generating scanners. A scanner, 
  sometimes called a tokenizer, is a program which recognizes lexical patterns in text."""
 
-toolchain = {'name': 'intel-para', 'version': '2014.12'} 
+toolchain = {'name': 'intel-para', 'version': '2014.12'}
 toolchainopts = {'pic': True}
 
 sources = [SOURCELOWER_TAR_GZ]
diff --git a/easybuild/easyconfigs/f/foss/foss-2014b.eb b/easybuild/easyconfigs/f/foss/foss-2014b.eb
index 5ff6c5693e1..538536a6960 100644
--- a/easybuild/easyconfigs/f/foss/foss-2014b.eb
+++ b/easybuild/easyconfigs/f/foss/foss-2014b.eb
@@ -28,7 +28,7 @@ comp_mpi_tc = (comp_mpi_tc_name, comp_mpi_tc_ver)
 # because of toolchain preperation functions
 dependencies = [
     ('GCC', '4.8.3'),
-    ('OpenMPI', '1.8.1', '', comp),  
+    ('OpenMPI', '1.8.1', '', comp),
     (blaslib, blasver, blassuff, comp),
     ('FFTW', '3.3.4', '', comp_mpi_tc),
     ('ScaLAPACK', '2.0.2', '-%s%s' % (blas, blassuff), comp_mpi_tc),
diff --git a/easybuild/easyconfigs/f/fqzcomp/fqzcomp-4.6-GCC-4.8.2.eb b/easybuild/easyconfigs/f/fqzcomp/fqzcomp-4.6-GCC-4.8.2.eb
index 0f7a6c3ea5b..c4cf3f3ff7c 100644
--- a/easybuild/easyconfigs/f/fqzcomp/fqzcomp-4.6-GCC-4.8.2.eb
+++ b/easybuild/easyconfigs/f/fqzcomp/fqzcomp-4.6-GCC-4.8.2.eb
@@ -24,7 +24,7 @@ source_urls = [SOURCEFORGE_SOURCE]
 files_to_copy = [(['fqz_comp'], 'bin')]
 
 sanity_check_paths = {
-    'files': ["bin/fqz_comp"], 
+    'files': ["bin/fqz_comp"],
     'dirs': []
 }
 
diff --git a/easybuild/easyconfigs/g/GEMSTAT/GEMSTAT-1.0-goolf-1.4.10.eb b/easybuild/easyconfigs/g/GEMSTAT/GEMSTAT-1.0-goolf-1.4.10.eb
index c3c35140d35..71eda7f1813 100644
--- a/easybuild/easyconfigs/g/GEMSTAT/GEMSTAT-1.0-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/g/GEMSTAT/GEMSTAT-1.0-goolf-1.4.10.eb
@@ -30,7 +30,7 @@ buildopts = ' GSL_DIR=$EBROOTGSL'
 
 files_to_copy = [
     (["seq2expr"], 'bin'),
-    "README.txt", "data"    
+    "README.txt", "data"
 ]
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/g/GEOS/GEOS-3.5.0-intel-2015b-Python-2.7.10.eb b/easybuild/easyconfigs/g/GEOS/GEOS-3.5.0-intel-2015b-Python-2.7.10.eb
index 6d5cb52fe8c..35073f5ad2c 100644
--- a/easybuild/easyconfigs/g/GEOS/GEOS-3.5.0-intel-2015b-Python-2.7.10.eb
+++ b/easybuild/easyconfigs/g/GEOS/GEOS-3.5.0-intel-2015b-Python-2.7.10.eb
@@ -18,7 +18,7 @@ versionsuffix = '-Python-%s' % pyver
 dependencies = [('Python', pyver)]
 
 builddependencies = [('SWIG', '3.0.7', versionsuffix)]
-    
+
 configopts = '--enable-python'
 
 modextrapaths = {'PYTHONPATH': 'lib/python%s/site-packages' % pyshortver}
diff --git a/easybuild/easyconfigs/g/GLPK/GLPK-4.48-ictce-5.2.0.eb b/easybuild/easyconfigs/g/GLPK/GLPK-4.48-ictce-5.2.0.eb
index afaaab1f33d..42150fd75f0 100644
--- a/easybuild/easyconfigs/g/GLPK/GLPK-4.48-ictce-5.2.0.eb
+++ b/easybuild/easyconfigs/g/GLPK/GLPK-4.48-ictce-5.2.0.eb
@@ -10,7 +10,7 @@ written in ANSI C and organized in the form of a callable library."""
 
 toolchain = {'name': 'ictce', 'version': '5.2.0'}
 toolchainopts = {'opt': True, 'optarch': True, 'pic': True}
- 
+
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = [GNU_SOURCE]
 
diff --git a/easybuild/easyconfigs/g/GLPK/GLPK-4.48-ictce-5.3.0.eb b/easybuild/easyconfigs/g/GLPK/GLPK-4.48-ictce-5.3.0.eb
index 4716a30ce55..c0b7a972313 100644
--- a/easybuild/easyconfigs/g/GLPK/GLPK-4.48-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/g/GLPK/GLPK-4.48-ictce-5.3.0.eb
@@ -10,7 +10,7 @@ written in ANSI C and organized in the form of a callable library."""
 
 toolchain = {'name': 'ictce', 'version': '5.3.0'}
 toolchainopts = {'opt': True, 'optarch': True, 'pic': True}
- 
+
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = ['http://ftpmirror.gnu.org/%(namelower)s']
 
diff --git a/easybuild/easyconfigs/g/GLPK/GLPK-4.53-goolf-1.4.10.eb b/easybuild/easyconfigs/g/GLPK/GLPK-4.53-goolf-1.4.10.eb
index 9aae2965314..4525095b971 100644
--- a/easybuild/easyconfigs/g/GLPK/GLPK-4.53-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/g/GLPK/GLPK-4.53-goolf-1.4.10.eb
@@ -9,7 +9,7 @@ programming (LP), mixed integer programming (MIP), and other related problems. I
 written in ANSI C and organized in the form of a callable library."""
 
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
- 
+
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = ['http://ftpmirror.gnu.org/%(namelower)s']
 
diff --git a/easybuild/easyconfigs/g/GLPK/GLPK-4.53-ictce-6.2.5.eb b/easybuild/easyconfigs/g/GLPK/GLPK-4.53-ictce-6.2.5.eb
index b55056667c6..aabef669ba9 100644
--- a/easybuild/easyconfigs/g/GLPK/GLPK-4.53-ictce-6.2.5.eb
+++ b/easybuild/easyconfigs/g/GLPK/GLPK-4.53-ictce-6.2.5.eb
@@ -10,7 +10,7 @@ written in ANSI C and organized in the form of a callable library."""
 
 toolchain = {'name': 'ictce', 'version': '6.2.5'}
 toolchainopts = {'opt': True, 'optarch': True, 'pic': True}
- 
+
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = ['http://ftpmirror.gnu.org/%(namelower)s']
 
diff --git a/easybuild/easyconfigs/g/GMAP-GSNAP/GMAP-GSNAP-2014-01-21-goolf-1.4.10.eb b/easybuild/easyconfigs/g/GMAP-GSNAP/GMAP-GSNAP-2014-01-21-goolf-1.4.10.eb
index 3ce82b5b2d7..5fbe4acc9a0 100644
--- a/easybuild/easyconfigs/g/GMAP-GSNAP/GMAP-GSNAP-2014-01-21-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/g/GMAP-GSNAP/GMAP-GSNAP-2014-01-21-goolf-1.4.10.eb
@@ -3,7 +3,7 @@
 # Swiss Institute of Bioinformatics
 # Biozentrum - University of Basel
 
-easyblock = 'ConfigureMake' 
+easyblock = 'ConfigureMake'
 
 name = 'GMAP-GSNAP'
 version = '2014-01-21'
diff --git a/easybuild/easyconfigs/g/GMAP-GSNAP/GMAP-GSNAP-2014-06-10-goolf-1.4.10.eb b/easybuild/easyconfigs/g/GMAP-GSNAP/GMAP-GSNAP-2014-06-10-goolf-1.4.10.eb
index 746e7c4f533..d83527abe3b 100644
--- a/easybuild/easyconfigs/g/GMAP-GSNAP/GMAP-GSNAP-2014-06-10-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/g/GMAP-GSNAP/GMAP-GSNAP-2014-06-10-goolf-1.4.10.eb
@@ -3,7 +3,7 @@
 # Swiss Institute of Bioinformatics
 # Biozentrum - University of Basel
 
-easyblock = 'ConfigureMake' 
+easyblock = 'ConfigureMake'
 
 name = 'GMAP-GSNAP'
 version = "2014-06-10"
diff --git a/easybuild/easyconfigs/g/Ghostscript/Ghostscript-9.16-goolf-1.7.20.eb b/easybuild/easyconfigs/g/Ghostscript/Ghostscript-9.16-goolf-1.7.20.eb
index 41de713278c..4e828aad873 100644
--- a/easybuild/easyconfigs/g/Ghostscript/Ghostscript-9.16-goolf-1.7.20.eb
+++ b/easybuild/easyconfigs/g/Ghostscript/Ghostscript-9.16-goolf-1.7.20.eb
@@ -17,7 +17,7 @@ checksums = ['829319325bbdb83f5c81379a8f86f38f']
 
 dependencies = [
     ('zlib', '1.2.8'),
-    ('libpng', '1.6.17'),  
+    ('libpng', '1.6.17'),
     ('freetype', '2.6'),
     ('fontconfig', '2.11.94'),
     ('GLib', '2.44.1'),
diff --git a/easybuild/easyconfigs/g/Gtkmm/Gtkmm-2.24.4-intel-2015a.eb b/easybuild/easyconfigs/g/Gtkmm/Gtkmm-2.24.4-intel-2015a.eb
index 8e1cb764c0a..f946da12a26 100644
--- a/easybuild/easyconfigs/g/Gtkmm/Gtkmm-2.24.4-intel-2015a.eb
+++ b/easybuild/easyconfigs/g/Gtkmm/Gtkmm-2.24.4-intel-2015a.eb
@@ -20,7 +20,7 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files': ['lib/libgtkmm-2.4.so.1'], 
+    'files': ['lib/libgtkmm-2.4.so.1'],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/g/Gtkmm/Gtkmm-2.24.4-intel-2015b.eb b/easybuild/easyconfigs/g/Gtkmm/Gtkmm-2.24.4-intel-2015b.eb
index f4d4f0209a8..60c1e59723f 100644
--- a/easybuild/easyconfigs/g/Gtkmm/Gtkmm-2.24.4-intel-2015b.eb
+++ b/easybuild/easyconfigs/g/Gtkmm/Gtkmm-2.24.4-intel-2015b.eb
@@ -20,7 +20,7 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files': ['lib/libgtkmm-2.4.so.1'], 
+    'files': ['lib/libgtkmm-2.4.so.1'],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/g/gettext/gettext-0.18.2-ictce-4.1.13.eb b/easybuild/easyconfigs/g/gettext/gettext-0.18.2-ictce-4.1.13.eb
index ea88dd569c3..cff1cf8e336 100644
--- a/easybuild/easyconfigs/g/gettext/gettext-0.18.2-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/g/gettext/gettext-0.18.2-ictce-4.1.13.eb
@@ -8,7 +8,7 @@ description = """GNU `gettext' is an important step for the GNU Translation Proj
 build many other steps. This package offers to programmers, translators, and even users, a well integrated set of tools
 and documentation"""
 
-toolchain = {'name': 'ictce', 'version': '4.1.13'} 
+toolchain = {'name': 'ictce', 'version': '4.1.13'}
 
 sources = [SOURCE_TAR_GZ]
 source_urls = [GNU_SOURCE]
diff --git a/easybuild/easyconfigs/g/gmvolf/gmvolf-1.7.12rc1.eb b/easybuild/easyconfigs/g/gmvolf/gmvolf-1.7.12rc1.eb
index c3fb773c88f..50901901bf3 100644
--- a/easybuild/easyconfigs/g/gmvolf/gmvolf-1.7.12rc1.eb
+++ b/easybuild/easyconfigs/g/gmvolf/gmvolf-1.7.12rc1.eb
@@ -32,6 +32,6 @@ dependencies = [
     (blaslib, blasver, blassuff, comp_mpi_tc),
     ('FFTW', '3.3.3', '', comp_mpi_tc),
     ('ScaLAPACK', '2.0.2', blas, comp_mpi_tc),
-] 
+]
 
 moduleclass = 'toolchain'
diff --git a/easybuild/easyconfigs/g/gnutls/gnutls-3.1.8-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/g/gnutls/gnutls-3.1.8-goalf-1.1.0-no-OFED.eb
index 8746928b55d..9315e9e792c 100644
--- a/easybuild/easyconfigs/g/gnutls/gnutls-3.1.8-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/g/gnutls/gnutls-3.1.8-goalf-1.1.0-no-OFED.eb
@@ -21,7 +21,7 @@ configopts = "--with-guile-site-dir=$EBROOTGUILE"
 
 sanity_check_paths = {
                       'files': ['bin/%s' % x for x in ['certtool', 'danetool', 'gnutls-cli', 'gnutls-cli-debug',
-                                                       'gnutls-serv', 'ocsptool', 'psktool', 'srptool']] + 
+                                                       'gnutls-serv', 'ocsptool', 'psktool', 'srptool']] +
                                ['lib/libgnutls%s' % x for x in ['.a', 'xx.a', '-xssl.a', '-openssl.a']],
                       'dirs': ['include/gnutls'],
                      }
diff --git a/easybuild/easyconfigs/g/gnutls/gnutls-3.1.8-goolf-1.4.10.eb b/easybuild/easyconfigs/g/gnutls/gnutls-3.1.8-goolf-1.4.10.eb
index 110dff5cb7e..0fc5d46401d 100644
--- a/easybuild/easyconfigs/g/gnutls/gnutls-3.1.8-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/g/gnutls/gnutls-3.1.8-goolf-1.4.10.eb
@@ -20,7 +20,7 @@ configopts = "--with-guile-site-dir=$EBROOTGUILE"
 
 sanity_check_paths = {
                       'files': ['bin/%s' % x for x in ['certtool', 'danetool', 'gnutls-cli', 'gnutls-cli-debug',
-                                                       'gnutls-serv', 'ocsptool', 'psktool', 'srptool']] + 
+                                                       'gnutls-serv', 'ocsptool', 'psktool', 'srptool']] +
                                ['lib/libgnutls%s' % x for x in ['.a', 'xx.a', '-xssl.a', '-openssl.a']],
                       'dirs': ['include/gnutls'],
                      }
diff --git a/easybuild/easyconfigs/g/gnutls/gnutls-3.4.7-GNU-4.9.3-2.25.eb b/easybuild/easyconfigs/g/gnutls/gnutls-3.4.7-GNU-4.9.3-2.25.eb
index a1b5c74cda0..d8830377733 100644
--- a/easybuild/easyconfigs/g/gnutls/gnutls-3.4.7-GNU-4.9.3-2.25.eb
+++ b/easybuild/easyconfigs/g/gnutls/gnutls-3.4.7-GNU-4.9.3-2.25.eb
@@ -31,7 +31,7 @@ configopts = "--with-guile-site-dir=$EBROOTGUILE --enable-openssl-compatibility
 
 sanity_check_paths = {
     'files': ['bin/%s' % x for x in ['certtool', 'crywrap', 'gnutls-cli', 'gnutls-cli-debug',
-                                     'gnutls-serv', 'ocsptool', 'psktool', 'srptool']] + 
+                                     'gnutls-serv', 'ocsptool', 'psktool', 'srptool']] +
              ['lib/libgnutls%s' % x for x in ['.%s' % SHLIB_EXT, 'xx.%s' % SHLIB_EXT, '-openssl.%s' % SHLIB_EXT]] +
              ['lib/guile/%s/guile-gnutls-v-2.so' % guileshortver],
     'dirs': ['include/gnutls'],
diff --git a/easybuild/easyconfigs/h/HBase/HBase-1.0.2.eb b/easybuild/easyconfigs/h/HBase/HBase-1.0.2.eb
index aeb9e7c8b09..ab9d5fd44fb 100644
--- a/easybuild/easyconfigs/h/HBase/HBase-1.0.2.eb
+++ b/easybuild/easyconfigs/h/HBase/HBase-1.0.2.eb
@@ -15,10 +15,10 @@ dependencies = [('Java', '1.7.0_80')]
 
 parallel = 1
 
-sanity_check_paths = {  
-    'files': ["bin/hbase"],  
-    'dirs': ["conf", "docs", "hbase-webapps", "lib"]  
-}  
+sanity_check_paths = {
+    'files': ["bin/hbase"],
+    'dirs': ["conf", "docs", "hbase-webapps", "lib"]
+}
 
 modextravars = {'HBASE_HOME': '%(installdir)s'}
 
diff --git a/easybuild/easyconfigs/h/HDF5/HDF5-1.8.10-patch1-goolf-1.5.14.eb b/easybuild/easyconfigs/h/HDF5/HDF5-1.8.10-patch1-goolf-1.5.14.eb
index 89abbbefcff..c83b2a63472 100644
--- a/easybuild/easyconfigs/h/HDF5/HDF5-1.8.10-patch1-goolf-1.5.14.eb
+++ b/easybuild/easyconfigs/h/HDF5/HDF5-1.8.10-patch1-goolf-1.5.14.eb
@@ -5,7 +5,7 @@ homepage = 'http://www.hdfgroup.org/HDF5/'
 description = """HDF5 is a unique technology suite that makes possible the management of 
  extremely large and complex data collections."""
 
-toolchain = {'name': 'goolf', 'version': '1.5.14'} 
+toolchain = {'name': 'goolf', 'version': '1.5.14'}
 toolchainopts = {'optarch': True, 'usempi': True, 'pic': True}
 
 source_urls = ['http://www.hdfgroup.org/ftp/HDF5/releases/hdf5-%(version)s/src']
diff --git a/easybuild/easyconfigs/h/HPL/HPL-2.1-gpsolf-2014.12.eb b/easybuild/easyconfigs/h/HPL/HPL-2.1-gpsolf-2014.12.eb
index 26abf7963c7..8b166299eb8 100644
--- a/easybuild/easyconfigs/h/HPL/HPL-2.1-gpsolf-2014.12.eb
+++ b/easybuild/easyconfigs/h/HPL/HPL-2.1-gpsolf-2014.12.eb
@@ -5,7 +5,7 @@ homepage = 'http://www.netlib.org/benchmark/hpl/'
 description = """HPL is a software package that solves a (random) dense linear system in double precision (64 bits) arithmetic 
 on distributed-memory computers. It can thus be regarded as a portable as well as freely available implementation of the 
 High Performance Computing Linpack Benchmark."""
-toolchain = {'name': 'gpsolf', 'version': '2014.12'} 
+toolchain = {'name': 'gpsolf', 'version': '2014.12'}
 toolchainopts = {'optarch': True, 'usempi': True}
 
 sources = [SOURCELOWER_TAR_GZ]
diff --git a/easybuild/easyconfigs/h/HPL/HPL-2.1-intel-para-2014.12.eb b/easybuild/easyconfigs/h/HPL/HPL-2.1-intel-para-2014.12.eb
index b56af425fea..0ad29d6c94f 100644
--- a/easybuild/easyconfigs/h/HPL/HPL-2.1-intel-para-2014.12.eb
+++ b/easybuild/easyconfigs/h/HPL/HPL-2.1-intel-para-2014.12.eb
@@ -5,7 +5,7 @@ homepage = 'http://www.netlib.org/benchmark/hpl/'
 description = """HPL is a software package that solves a (random) dense linear system in double precision (64 bits) arithmetic 
  on distributed-memory computers. It can thus be regarded as a portable as well as freely available implementation of the 
  High Performance Computing Linpack Benchmark."""
-toolchain = {'name': 'intel-para', 'version': '2014.12'} 
+toolchain = {'name': 'intel-para', 'version': '2014.12'}
 toolchainopts = {'optarch': True, 'usempi': True}
 
 sources = [SOURCELOWER_TAR_GZ]
diff --git a/easybuild/easyconfigs/h/HTSlib/HTSlib-1.1-goolf-1.4.10.eb b/easybuild/easyconfigs/h/HTSlib/HTSlib-1.1-goolf-1.4.10.eb
index 99632e13613..d99049bc6c6 100644
--- a/easybuild/easyconfigs/h/HTSlib/HTSlib-1.1-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/h/HTSlib/HTSlib-1.1-goolf-1.4.10.eb
@@ -3,7 +3,7 @@
 # Swiss Institute of Bioinformatics
 # Biozentrum - University of Basel
 
-easyblock = 'ConfigureMake' 
+easyblock = 'ConfigureMake'
 
 name = 'HTSlib'
 version = '1.1'
diff --git a/easybuild/easyconfigs/h/HarfBuzz/HarfBuzz-0.9.41-intel-2015a.eb b/easybuild/easyconfigs/h/HarfBuzz/HarfBuzz-0.9.41-intel-2015a.eb
index 77c75fbe48c..aa9159ceb50 100644
--- a/easybuild/easyconfigs/h/HarfBuzz/HarfBuzz-0.9.41-intel-2015a.eb
+++ b/easybuild/easyconfigs/h/HarfBuzz/HarfBuzz-0.9.41-intel-2015a.eb
@@ -18,7 +18,7 @@ dependencies = [
     ('GLib', '2.41.2'),
 ]
 
-sanity_check_paths = {                                                                                                   
+sanity_check_paths = {
     'files': ['lib/libharfbuzz.%s' % SHLIB_EXT],
     'dirs': [],
 }
diff --git a/easybuild/easyconfigs/h/HarfBuzz/HarfBuzz-0.9.41-intel-2015b.eb b/easybuild/easyconfigs/h/HarfBuzz/HarfBuzz-0.9.41-intel-2015b.eb
index ce42351add0..82ca87f89c9 100644
--- a/easybuild/easyconfigs/h/HarfBuzz/HarfBuzz-0.9.41-intel-2015b.eb
+++ b/easybuild/easyconfigs/h/HarfBuzz/HarfBuzz-0.9.41-intel-2015b.eb
@@ -18,7 +18,7 @@ dependencies = [
     ('GLib', '2.41.2'),
 ]
 
-sanity_check_paths = {                                                                                                   
+sanity_check_paths = {
     'files': ['lib/libharfbuzz.%s' % SHLIB_EXT],
     'dirs': [],
 }
diff --git a/easybuild/easyconfigs/h/hisat/hisat-0.1.5-beta-goolf-1.7.20.eb b/easybuild/easyconfigs/h/hisat/hisat-0.1.5-beta-goolf-1.7.20.eb
index bd8c70bf672..bece15fbe37 100644
--- a/easybuild/easyconfigs/h/hisat/hisat-0.1.5-beta-goolf-1.7.20.eb
+++ b/easybuild/easyconfigs/h/hisat/hisat-0.1.5-beta-goolf-1.7.20.eb
@@ -19,7 +19,7 @@ source_urls = ['http://ccb.jhu.edu/software/hisat/downloads/']
 
 checksums = ['9524a0170d85c5b560b51e0087f4cf46']
 
-executables = [name, 'hisat-build', 'hisat-inspect', 'hisat-build-s', 'hisat-inspect-s', 'hisat-align-s', 
+executables = [name, 'hisat-build', 'hisat-inspect', 'hisat-build-s', 'hisat-inspect-s', 'hisat-align-s',
                'hisat-build-l', 'hisat-inspect-l', 'hisat-align-l']
 files_to_copy = [(executables, 'bin')]
 
diff --git a/easybuild/easyconfigs/h/hwloc/hwloc-1.10.0-GCC-4.9.2.eb b/easybuild/easyconfigs/h/hwloc/hwloc-1.10.0-GCC-4.9.2.eb
index f86d5d11abd..24816732939 100644
--- a/easybuild/easyconfigs/h/hwloc/hwloc-1.10.0-GCC-4.9.2.eb
+++ b/easybuild/easyconfigs/h/hwloc/hwloc-1.10.0-GCC-4.9.2.eb
@@ -16,7 +16,7 @@ toolchain = {'name': 'GCC', 'version': '4.9.2'}
 dependencies = [('numactl', '2.0.10')]
 
 configopts = "--enable-libnuma=$EBROOTNUMACTL"
-  
+
 source_urls = ['http://www.open-mpi.org/software/hwloc/v%(version_major_minor)s/downloads/']
 sources = [SOURCE_TAR_GZ]
 
diff --git a/easybuild/easyconfigs/h/hwloc/hwloc-1.10.1-GCC-4.8.4.eb b/easybuild/easyconfigs/h/hwloc/hwloc-1.10.1-GCC-4.8.4.eb
index 6adedf3a5dd..ec221125479 100644
--- a/easybuild/easyconfigs/h/hwloc/hwloc-1.10.1-GCC-4.8.4.eb
+++ b/easybuild/easyconfigs/h/hwloc/hwloc-1.10.1-GCC-4.8.4.eb
@@ -19,5 +19,5 @@ sources = [SOURCE_TAR_GZ]
 dependencies = [('numactl', '2.0.10')]
 
 configopts = "--enable-libnuma=$EBROOTNUMACTL"
-  
+
 moduleclass = 'system'
diff --git a/easybuild/easyconfigs/h/hwloc/hwloc-1.10.1-GNU-4.9.2-2.25.eb b/easybuild/easyconfigs/h/hwloc/hwloc-1.10.1-GNU-4.9.2-2.25.eb
index 33b2aeafd66..afa499ff97a 100644
--- a/easybuild/easyconfigs/h/hwloc/hwloc-1.10.1-GNU-4.9.2-2.25.eb
+++ b/easybuild/easyconfigs/h/hwloc/hwloc-1.10.1-GNU-4.9.2-2.25.eb
@@ -16,7 +16,7 @@ toolchain = {'name': 'GNU', 'version': '4.9.2-2.25'}
 dependencies = [('numactl', '2.0.10')]
 
 configopts = "--enable-libnuma=$EBROOTNUMACTL"
-  
+
 source_urls = ['http://www.open-mpi.org/software/hwloc/v%(version_major_minor)s/downloads/']
 sources = [SOURCE_TAR_GZ]
 
diff --git a/easybuild/easyconfigs/h/hwloc/hwloc-1.11.0-GNU-4.9.3-2.25.eb b/easybuild/easyconfigs/h/hwloc/hwloc-1.11.0-GNU-4.9.3-2.25.eb
index 086602c3aaf..5b67b5f4908 100644
--- a/easybuild/easyconfigs/h/hwloc/hwloc-1.11.0-GNU-4.9.3-2.25.eb
+++ b/easybuild/easyconfigs/h/hwloc/hwloc-1.11.0-GNU-4.9.3-2.25.eb
@@ -16,7 +16,7 @@ toolchain = {'name': 'GNU', 'version': '4.9.3-2.25'}
 dependencies = [('numactl', '2.0.10')]
 
 configopts = "--enable-libnuma=$EBROOTNUMACTL"
-  
+
 source_urls = ['http://www.open-mpi.org/software/hwloc/v%(version_major_minor)s/downloads/']
 sources = [SOURCE_TAR_GZ]
 
diff --git a/easybuild/easyconfigs/h/hwloc/hwloc-1.11.1-iccifort-2015.3.187-GNU-4.9.3-2.25.eb b/easybuild/easyconfigs/h/hwloc/hwloc-1.11.1-iccifort-2015.3.187-GNU-4.9.3-2.25.eb
index e2d5ab4c7f9..50bcad92f39 100644
--- a/easybuild/easyconfigs/h/hwloc/hwloc-1.11.1-iccifort-2015.3.187-GNU-4.9.3-2.25.eb
+++ b/easybuild/easyconfigs/h/hwloc/hwloc-1.11.1-iccifort-2015.3.187-GNU-4.9.3-2.25.eb
@@ -16,7 +16,7 @@ toolchain = {'name': 'iccifort', 'version': '2015.3.187-GNU-4.9.3-2.25'}
 dependencies = [('numactl', '2.0.10')]
 
 configopts = "--enable-libnuma=$EBROOTNUMACTL"
-  
+
 source_urls = ['http://www.open-mpi.org/software/hwloc/v%(version_major_minor)s/downloads/']
 sources = [SOURCE_TAR_GZ]
 
diff --git a/easybuild/easyconfigs/h/hwloc/hwloc-1.11.2-GNU-4.9.3-2.25.eb b/easybuild/easyconfigs/h/hwloc/hwloc-1.11.2-GNU-4.9.3-2.25.eb
index 4a93ec7e701..41a09546a09 100644
--- a/easybuild/easyconfigs/h/hwloc/hwloc-1.11.2-GNU-4.9.3-2.25.eb
+++ b/easybuild/easyconfigs/h/hwloc/hwloc-1.11.2-GNU-4.9.3-2.25.eb
@@ -16,7 +16,7 @@ toolchain = {'name': 'GNU', 'version': '4.9.3-2.25'}
 dependencies = [('numactl', '2.0.10')]
 
 configopts = "--enable-libnuma=$EBROOTNUMACTL"
-  
+
 source_urls = ['http://www.open-mpi.org/software/hwloc/v%(version_major_minor)s/downloads/']
 sources = [SOURCE_TAR_GZ]
 
diff --git a/easybuild/easyconfigs/h/hwloc/hwloc-1.6.2-ClangGCC-1.1.3.eb b/easybuild/easyconfigs/h/hwloc/hwloc-1.6.2-ClangGCC-1.1.3.eb
index 21df4831304..3e12868a781 100644
--- a/easybuild/easyconfigs/h/hwloc/hwloc-1.6.2-ClangGCC-1.1.3.eb
+++ b/easybuild/easyconfigs/h/hwloc/hwloc-1.6.2-ClangGCC-1.1.3.eb
@@ -12,7 +12,7 @@ description = """The Portable Hardware Locality (hwloc) software package provide
  information about modern computing hardware so as to exploit it accordingly and efficiently."""
 
 toolchain = {'name': 'ClangGCC', 'version': '1.1.3'}
-  
+
 source_urls = ['http://www.open-mpi.org/software/hwloc/v%(version_major_minor)s/downloads/']
 sources = [SOURCE_TAR_GZ]
 
diff --git a/easybuild/easyconfigs/h/hwloc/hwloc-1.6.2-GCC-4.6.4.eb b/easybuild/easyconfigs/h/hwloc/hwloc-1.6.2-GCC-4.6.4.eb
index 3c07bbe6148..ca74b09ce12 100644
--- a/easybuild/easyconfigs/h/hwloc/hwloc-1.6.2-GCC-4.6.4.eb
+++ b/easybuild/easyconfigs/h/hwloc/hwloc-1.6.2-GCC-4.6.4.eb
@@ -12,7 +12,7 @@ description = """The Portable Hardware Locality (hwloc) software package provide
  information about modern computing hardware so as to exploit it accordingly and efficiently."""
 
 toolchain = {'name': 'GCC', 'version': '4.6.4'}
-  
+
 source_urls = ['http://www.open-mpi.org/software/hwloc/v%(version_major_minor)s/downloads/']
 sources = [SOURCE_TAR_GZ]
 
diff --git a/easybuild/easyconfigs/h/hwloc/hwloc-1.6.2-GCC-4.7.2.eb b/easybuild/easyconfigs/h/hwloc/hwloc-1.6.2-GCC-4.7.2.eb
index 19d34c3d1a3..58f69d8db5b 100644
--- a/easybuild/easyconfigs/h/hwloc/hwloc-1.6.2-GCC-4.7.2.eb
+++ b/easybuild/easyconfigs/h/hwloc/hwloc-1.6.2-GCC-4.7.2.eb
@@ -12,7 +12,7 @@ description = """The Portable Hardware Locality (hwloc) software package provide
  information about modern computing hardware so as to exploit it accordingly and efficiently."""
 
 toolchain = {'name': 'GCC', 'version': '4.7.2'}
-  
+
 source_urls = ['http://www.open-mpi.org/software/hwloc/v%(version_major_minor)s/downloads/']
 sources = [SOURCE_TAR_GZ]
 
diff --git a/easybuild/easyconfigs/h/hwloc/hwloc-1.6.2-ictce-5.3.0.eb b/easybuild/easyconfigs/h/hwloc/hwloc-1.6.2-ictce-5.3.0.eb
index 35e5b4d3bc8..4a1f0300da7 100644
--- a/easybuild/easyconfigs/h/hwloc/hwloc-1.6.2-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/h/hwloc/hwloc-1.6.2-ictce-5.3.0.eb
@@ -12,7 +12,7 @@ description = """The Portable Hardware Locality (hwloc) software package provide
  information about modern computing hardware so as to exploit it accordingly and efficiently."""
 
 toolchain = {'name': 'ictce', 'version': '5.3.0'}
-  
+
 source_urls = ['http://www.open-mpi.org/software/hwloc/v%(version_major_minor)s/downloads/']
 sources = [SOURCE_TAR_GZ]
 
diff --git a/easybuild/easyconfigs/h/hwloc/hwloc-1.7.2-GCC-4.8.2.eb b/easybuild/easyconfigs/h/hwloc/hwloc-1.7.2-GCC-4.8.2.eb
index ade75969bd5..13051e6d815 100644
--- a/easybuild/easyconfigs/h/hwloc/hwloc-1.7.2-GCC-4.8.2.eb
+++ b/easybuild/easyconfigs/h/hwloc/hwloc-1.7.2-GCC-4.8.2.eb
@@ -12,7 +12,7 @@ description = """The Portable Hardware Locality (hwloc) software package provide
  information about modern computing hardware so as to exploit it accordingly and efficiently."""
 
 toolchain = {'name': 'GCC', 'version': '4.8.2'}
-  
+
 source_urls = ['http://www.open-mpi.org/software/hwloc/v%(version_major_minor)s/downloads/']
 sources = [SOURCE_TAR_GZ]
 
diff --git a/easybuild/easyconfigs/h/hwloc/hwloc-1.7.2-ictce-5.3.0.eb b/easybuild/easyconfigs/h/hwloc/hwloc-1.7.2-ictce-5.3.0.eb
index bbe1c894d7b..459fa88c69e 100644
--- a/easybuild/easyconfigs/h/hwloc/hwloc-1.7.2-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/h/hwloc/hwloc-1.7.2-ictce-5.3.0.eb
@@ -12,7 +12,7 @@ description = """The Portable Hardware Locality (hwloc) software package provide
  information about modern computing hardware so as to exploit it accordingly and efficiently."""
 
 toolchain = {'name': 'ictce', 'version': '5.3.0'}
-  
+
 source_urls = ['http://www.open-mpi.org/software/hwloc/v%(version_major_minor)s/downloads/']
 sources = [SOURCE_TAR_GZ]
 
diff --git a/easybuild/easyconfigs/h/hwloc/hwloc-1.8-gcccuda-2.6.10.eb b/easybuild/easyconfigs/h/hwloc/hwloc-1.8-gcccuda-2.6.10.eb
index b8de1f4777b..b61501e1418 100644
--- a/easybuild/easyconfigs/h/hwloc/hwloc-1.8-gcccuda-2.6.10.eb
+++ b/easybuild/easyconfigs/h/hwloc/hwloc-1.8-gcccuda-2.6.10.eb
@@ -12,7 +12,7 @@ description = """The Portable Hardware Locality (hwloc) software package provide
  information about modern computing hardware so as to exploit it accordingly and efficiently."""
 
 toolchain = {'name': 'gcccuda', 'version': '2.6.10'}
-  
+
 source_urls = ['http://www.open-mpi.org/software/hwloc/v%(version_major_minor)s/downloads/']
 sources = [SOURCE_TAR_GZ]
 
diff --git a/easybuild/easyconfigs/h/hwloc/hwloc-1.8.1-GCC-4.8.2.eb b/easybuild/easyconfigs/h/hwloc/hwloc-1.8.1-GCC-4.8.2.eb
index cb11169e922..ea7fbe41ddd 100644
--- a/easybuild/easyconfigs/h/hwloc/hwloc-1.8.1-GCC-4.8.2.eb
+++ b/easybuild/easyconfigs/h/hwloc/hwloc-1.8.1-GCC-4.8.2.eb
@@ -12,7 +12,7 @@ description = """The Portable Hardware Locality (hwloc) software package provide
  information about modern computing hardware so as to exploit it accordingly and efficiently."""
 
 toolchain = {'name': 'GCC', 'version': '4.8.2'}
-  
+
 source_urls = ['http://www.open-mpi.org/software/hwloc/v%(version_major_minor)s/downloads/']
 sources = [SOURCE_TAR_GZ]
 
diff --git a/easybuild/easyconfigs/h/hwloc/hwloc-1.8.1-GCC-4.8.3.eb b/easybuild/easyconfigs/h/hwloc/hwloc-1.8.1-GCC-4.8.3.eb
index dd1343eaa75..82f551b2472 100644
--- a/easybuild/easyconfigs/h/hwloc/hwloc-1.8.1-GCC-4.8.3.eb
+++ b/easybuild/easyconfigs/h/hwloc/hwloc-1.8.1-GCC-4.8.3.eb
@@ -12,7 +12,7 @@ description = """The Portable Hardware Locality (hwloc) software package provide
  information about modern computing hardware so as to exploit it accordingly and efficiently."""
 
 toolchain = {'name': 'GCC', 'version': '4.8.3'}
-  
+
 source_urls = ['http://www.open-mpi.org/software/hwloc/v%(version_major_minor)s/downloads/']
 sources = [SOURCE_TAR_GZ]
 
diff --git a/easybuild/easyconfigs/h/hwloc/hwloc-1.9-GCC-4.8.3.eb b/easybuild/easyconfigs/h/hwloc/hwloc-1.9-GCC-4.8.3.eb
index c21425bb3c7..5353d4e58c4 100644
--- a/easybuild/easyconfigs/h/hwloc/hwloc-1.9-GCC-4.8.3.eb
+++ b/easybuild/easyconfigs/h/hwloc/hwloc-1.9-GCC-4.8.3.eb
@@ -16,7 +16,7 @@ toolchain = {'name': 'GCC', 'version': '4.8.3'}
 dependencies = [('numactl', '2.0.9')]
 
 configopts = "--enable-libnuma=$EBROOTNUMACTL"
-  
+
 source_urls = ['http://www.open-mpi.org/software/hwloc/v%(version_major_minor)s/downloads/']
 sources = [SOURCE_TAR_GZ]
 
diff --git a/easybuild/easyconfigs/i/IDBA-UD/IDBA-UD-1.1.1-goolf-1.4.10.eb b/easybuild/easyconfigs/i/IDBA-UD/IDBA-UD-1.1.1-goolf-1.4.10.eb
index 0ee4a4f7403..776e9a78462 100644
--- a/easybuild/easyconfigs/i/IDBA-UD/IDBA-UD-1.1.1-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/i/IDBA-UD/IDBA-UD-1.1.1-goolf-1.4.10.eb
@@ -8,7 +8,7 @@
 easyblock = 'MakeCp'
 
 name = 'IDBA-UD'
-version = '1.1.1' 
+version = '1.1.1'
 
 homepage = 'http://i.cs.hku.hk/~alse/hkubrg/projects/idba_ud/'
 description = """ IDBA-UD is a iterative De Bruijn Graph De Novo Assembler for Short Reads 
@@ -31,7 +31,7 @@ prebuildopts = './configure && '
 buildopts = ' && rm -fr bin/*.o && rm -fr bin/Makefile*'
 
 files_to_copy = ["bin", "script", "README", "ChangeLog", "NEWS"]
-        
+
 sanity_check_paths = {
     'files': ["bin/%s" % x for x in ["idba", "idba_hybrid", "idba_tran",
                                     "idba_ud", "parallel_blat", "idba_tran_test"]],
diff --git a/easybuild/easyconfigs/i/IOR/IOR-2.10.3-goolf-1.4.10-mpiio.eb b/easybuild/easyconfigs/i/IOR/IOR-2.10.3-goolf-1.4.10-mpiio.eb
index 2aebd3c1b6e..2f880e46891 100644
--- a/easybuild/easyconfigs/i/IOR/IOR-2.10.3-goolf-1.4.10-mpiio.eb
+++ b/easybuild/easyconfigs/i/IOR/IOR-2.10.3-goolf-1.4.10-mpiio.eb
@@ -25,7 +25,7 @@ sources = [SOURCE_TGZ]
 # gmake all        -- IOR with POSIX, MPIIO, HDF5, and NCMPI interfaces
 buildopts = ' mpiio'
 
-files_to_copy = [(['src/C/IOR'], 'bin'), 
+files_to_copy = [(['src/C/IOR'], 'bin'),
                 "README", "RELEASE_LOG", "UNDOCUMENTED_OPTIONS", "USER_GUIDE", "scripts", "testing"]
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/i/IOR/IOR-2.10.3-intel-2014b-mpiio.eb b/easybuild/easyconfigs/i/IOR/IOR-2.10.3-intel-2014b-mpiio.eb
index 50f1a0bd7d8..ac67b88a092 100644
--- a/easybuild/easyconfigs/i/IOR/IOR-2.10.3-intel-2014b-mpiio.eb
+++ b/easybuild/easyconfigs/i/IOR/IOR-2.10.3-intel-2014b-mpiio.eb
@@ -25,7 +25,7 @@ sources = [SOURCE_TGZ]
 # gmake all        -- IOR with POSIX, MPIIO, HDF5, and NCMPI interfaces
 buildopts = ' mpiio'
 
-files_to_copy = [(['src/C/IOR'], 'bin'), 
+files_to_copy = [(['src/C/IOR'], 'bin'),
                 "README", "RELEASE_LOG", "UNDOCUMENTED_OPTIONS", "USER_GUIDE", "scripts", "testing"]
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/i/IsoInfer/IsoInfer-0.9.1-goolf-1.4.10.eb b/easybuild/easyconfigs/i/IsoInfer/IsoInfer-0.9.1-goolf-1.4.10.eb
index 7dc3787320b..5f710302572 100644
--- a/easybuild/easyconfigs/i/IsoInfer/IsoInfer-0.9.1-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/i/IsoInfer/IsoInfer-0.9.1-goolf-1.4.10.eb
@@ -20,7 +20,7 @@ sources = [
 ]
 source_urls = ['http://www.cs.ucr.edu/~jianxing']
 
-dependencies = [ 
+dependencies = [
     ('QuadProg++', '1.2.1'),
     ('GLPK', '4.53'),
     ('GSL', '1.16')
diff --git a/easybuild/easyconfigs/i/IsoInfer/IsoInfer-0.9.1-ictce-6.2.5.eb b/easybuild/easyconfigs/i/IsoInfer/IsoInfer-0.9.1-ictce-6.2.5.eb
index 436dd9a680a..10342bedf08 100644
--- a/easybuild/easyconfigs/i/IsoInfer/IsoInfer-0.9.1-ictce-6.2.5.eb
+++ b/easybuild/easyconfigs/i/IsoInfer/IsoInfer-0.9.1-ictce-6.2.5.eb
@@ -20,7 +20,7 @@ sources = [
 ]
 source_urls = ['http://www.cs.ucr.edu/~jianxing']
 
-dependencies = [ 
+dependencies = [
     ('QuadProg++', '1.2.1'),
     ('GLPK', '4.53'),
     ('GSL', '1.16')
diff --git a/easybuild/easyconfigs/i/ictce/ictce-4.0.6.eb b/easybuild/easyconfigs/i/ictce/ictce-4.0.6.eb
index 72df26b46c7..77fb61dc74e 100644
--- a/easybuild/easyconfigs/i/ictce/ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/i/ictce/ictce-4.0.6.eb
@@ -9,7 +9,7 @@ description = """Intel Cluster Toolkit Compiler Edition provides Intel C/C++ and
 toolchain = {'name': 'dummy', 'version': 'dummy'}
 
 compver = '2011.6.233'
-dependencies = [ 
+dependencies = [
     ('icc', compver),
     ('ifort', compver),
     ('impi', '4.0.2.003', '', ('iccifort', compver)),
diff --git a/easybuild/easyconfigs/i/iimpi/iimpi-4.0.6.eb b/easybuild/easyconfigs/i/iimpi/iimpi-4.0.6.eb
index ffa9bd38436..51b3aa5c0ff 100644
--- a/easybuild/easyconfigs/i/iimpi/iimpi-4.0.6.eb
+++ b/easybuild/easyconfigs/i/iimpi/iimpi-4.0.6.eb
@@ -9,7 +9,7 @@ description = """Intel C/C++ and Fortran compilers, alongside Intel MPI."""
 toolchain = {'name': 'dummy', 'version': 'dummy'}
 
 compver = '2011.6.233'
-dependencies = [ 
+dependencies = [
     ('icc', compver),
     ('ifort', compver),
     ('impi', '4.0.2.003', '', ('iccifort', compver)),
diff --git a/easybuild/easyconfigs/i/imkl/imkl-11.2.1.133-ipsmpi-2014.12.eb b/easybuild/easyconfigs/i/imkl/imkl-11.2.1.133-ipsmpi-2014.12.eb
index a44565b87fc..58af7333725 100644
--- a/easybuild/easyconfigs/i/imkl/imkl-11.2.1.133-ipsmpi-2014.12.eb
+++ b/easybuild/easyconfigs/i/imkl/imkl-11.2.1.133-ipsmpi-2014.12.eb
@@ -1,12 +1,12 @@
 name = 'imkl'
-version = "11.2.1.133" 
+version = "11.2.1.133"
 
 homepage = 'http://software.intel.com/en-us/intel-mkl/'
 description = """Intel Math Kernel Library is a library of highly optimized,
  extensively threaded math routines for science, engineering, and financial
  applications that require maximum performance. Core math functions include
  BLAS, LAPACK, ScaLAPACK, Sparse Solvers, Fast Fourier Transforms, Vector Math, and more."""
-toolchain = {'name': 'ipsmpi', 'version': '2014.12'} 
+toolchain = {'name': 'ipsmpi', 'version': '2014.12'}
 
 sources = ['l_mkl_%(version)s.tgz']
 
diff --git a/easybuild/easyconfigs/i/ispc/ispc-1.6.0.eb b/easybuild/easyconfigs/i/ispc/ispc-1.6.0.eb
index 5f9a44b8c20..0e49c82636c 100644
--- a/easybuild/easyconfigs/i/ispc/ispc-1.6.0.eb
+++ b/easybuild/easyconfigs/i/ispc/ispc-1.6.0.eb
@@ -17,7 +17,7 @@ sources = ['ispc-v%(version)s-linux.tar.gz']
 source_urls = [('http://sourceforge.net/projects/ispcmirror/files/v%(version)s', 'download')]
 
 sanity_check_paths = {
-    'files': ["ispc"], 
+    'files': ["ispc"],
     'dirs': []
 }
 
diff --git a/easybuild/easyconfigs/j/Jansson/Jansson-2.5-gcccuda-2.6.10.eb b/easybuild/easyconfigs/j/Jansson/Jansson-2.5-gcccuda-2.6.10.eb
index d889b3d0b2c..949fa049839 100644
--- a/easybuild/easyconfigs/j/Jansson/Jansson-2.5-gcccuda-2.6.10.eb
+++ b/easybuild/easyconfigs/j/Jansson/Jansson-2.5-gcccuda-2.6.10.eb
@@ -13,7 +13,7 @@ description = """Jansson is a C library for encoding, decoding and manipulating
  * Extensive test suite"""
 
 toolchain = {'name': 'gcccuda', 'version': '2.6.10'}
-  
+
 # fi. https://github.com/akheron/jansson/archive/2.5.zip
 source_urls = ['https://github.com/akheron/jansson/archive/']
 sources = ['%(version)s.tar.gz']
diff --git a/easybuild/easyconfigs/j/Jansson/Jansson-2.6-GCC-4.8.3.eb b/easybuild/easyconfigs/j/Jansson/Jansson-2.6-GCC-4.8.3.eb
index 0803b327c8a..6da2045abd9 100644
--- a/easybuild/easyconfigs/j/Jansson/Jansson-2.6-GCC-4.8.3.eb
+++ b/easybuild/easyconfigs/j/Jansson/Jansson-2.6-GCC-4.8.3.eb
@@ -13,7 +13,7 @@ description = """Jansson is a C library for encoding, decoding and manipulating
  * Extensive test suite"""
 
 toolchain = {'name': 'GCC', 'version': '4.8.3'}
-  
+
 # fi. https://github.com/akheron/jansson/archive/2.5.zip
 source_urls = ['https://github.com/akheron/jansson/archive/']
 sources = ['%(version)s.tar.gz']
diff --git a/easybuild/easyconfigs/j/JasPer/JasPer-1.900.1-goolf-1.5.14.eb b/easybuild/easyconfigs/j/JasPer/JasPer-1.900.1-goolf-1.5.14.eb
index e398d414f13..8d3aa6f5feb 100644
--- a/easybuild/easyconfigs/j/JasPer/JasPer-1.900.1-goolf-1.5.14.eb
+++ b/easybuild/easyconfigs/j/JasPer/JasPer-1.900.1-goolf-1.5.14.eb
@@ -6,7 +6,7 @@ version = '1.900.1'
 homepage = 'http://www.ece.uvic.ca/~frodo/jasper/'
 description = "gzip (GNU zip) is a popular data compression program as a replacement for compress"
 
-toolchain = {'name': 'goolf', 'version': '1.5.14'} 
+toolchain = {'name': 'goolf', 'version': '1.5.14'}
 toolchainopts = {'pic': True}
 
 sources = [SOURCELOWER_ZIP]
diff --git a/easybuild/easyconfigs/l/libICE/libICE-1.0.8-intel-2014b.eb b/easybuild/easyconfigs/l/libICE/libICE-1.0.8-intel-2014b.eb
index d296c6ae8cb..3280a4d8e4a 100644
--- a/easybuild/easyconfigs/l/libICE/libICE-1.0.8-intel-2014b.eb
+++ b/easybuild/easyconfigs/l/libICE/libICE-1.0.8-intel-2014b.eb
@@ -6,7 +6,7 @@ version = '1.0.8'
 homepage = "http://www.freedesktop.org/wiki/Software/xlibs"
 description = """X Inter-Client Exchange library for freedesktop.org"""
 
-toolchain = {'name': 'intel', 'version': '2014b'} 
+toolchain = {'name': 'intel', 'version': '2014b'}
 
 sources = [SOURCE_TAR_GZ]
 source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/']
diff --git a/easybuild/easyconfigs/l/libICE/libICE-1.0.9-intel-2015a.eb b/easybuild/easyconfigs/l/libICE/libICE-1.0.9-intel-2015a.eb
index 57f6a9f4e3f..c7f664c8c8f 100644
--- a/easybuild/easyconfigs/l/libICE/libICE-1.0.9-intel-2015a.eb
+++ b/easybuild/easyconfigs/l/libICE/libICE-1.0.9-intel-2015a.eb
@@ -6,7 +6,7 @@ version = '1.0.9'
 homepage = "http://www.freedesktop.org/wiki/Software/xlibs"
 description = """X Inter-Client Exchange library for freedesktop.org"""
 
-toolchain = {'name': 'intel', 'version': '2015a'} 
+toolchain = {'name': 'intel', 'version': '2015a'}
 
 sources = [SOURCE_TAR_GZ]
 source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/']
diff --git a/easybuild/easyconfigs/l/libICE/libICE-1.0.9-intel-2015b.eb b/easybuild/easyconfigs/l/libICE/libICE-1.0.9-intel-2015b.eb
index 061d77840dd..87ccf251e18 100644
--- a/easybuild/easyconfigs/l/libICE/libICE-1.0.9-intel-2015b.eb
+++ b/easybuild/easyconfigs/l/libICE/libICE-1.0.9-intel-2015b.eb
@@ -6,7 +6,7 @@ version = '1.0.9'
 homepage = "http://www.freedesktop.org/wiki/Software/xlibs"
 description = """X Inter-Client Exchange library for freedesktop.org"""
 
-toolchain = {'name': 'intel', 'version': '2015b'} 
+toolchain = {'name': 'intel', 'version': '2015b'}
 
 sources = [SOURCE_TAR_GZ]
 source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/']
diff --git a/easybuild/easyconfigs/l/libX11/libX11-1.6.2-intel-2014b-Python-2.7.8.eb b/easybuild/easyconfigs/l/libX11/libX11-1.6.2-intel-2014b-Python-2.7.8.eb
index 491d7b754b3..6dc47a39efc 100644
--- a/easybuild/easyconfigs/l/libX11/libX11-1.6.2-intel-2014b-Python-2.7.8.eb
+++ b/easybuild/easyconfigs/l/libX11/libX11-1.6.2-intel-2014b-Python-2.7.8.eb
@@ -7,7 +7,7 @@ versionsuffix = '-Python-2.7.8'
 homepage = "http://www.freedesktop.org/wiki/Software/xlibs"
 description = """X11 client-side library"""
 
-toolchain = {'name': 'intel', 'version': '2014b'} 
+toolchain = {'name': 'intel', 'version': '2014b'}
 
 sources = [SOURCE_TAR_GZ]
 source_urls = [XORG_LIB_SOURCE]
diff --git a/easybuild/easyconfigs/l/libX11/libX11-1.6.2-intel-2015a-Python-2.7.9.eb b/easybuild/easyconfigs/l/libX11/libX11-1.6.2-intel-2015a-Python-2.7.9.eb
index 3f72262d57d..ee582416a09 100644
--- a/easybuild/easyconfigs/l/libX11/libX11-1.6.2-intel-2015a-Python-2.7.9.eb
+++ b/easybuild/easyconfigs/l/libX11/libX11-1.6.2-intel-2015a-Python-2.7.9.eb
@@ -7,7 +7,7 @@ versionsuffix = '-Python-2.7.9'
 homepage = "http://www.freedesktop.org/wiki/Software/xlibs"
 description = """X11 client-side library"""
 
-toolchain = {'name': 'intel', 'version': '2015a'} 
+toolchain = {'name': 'intel', 'version': '2015a'}
 
 sources = [SOURCE_TAR_GZ]
 source_urls = [XORG_LIB_SOURCE]
diff --git a/easybuild/easyconfigs/l/libX11/libX11-1.6.3-intel-2015a-Python-2.7.10.eb b/easybuild/easyconfigs/l/libX11/libX11-1.6.3-intel-2015a-Python-2.7.10.eb
index 9c513d4634c..a4a74373002 100644
--- a/easybuild/easyconfigs/l/libX11/libX11-1.6.3-intel-2015a-Python-2.7.10.eb
+++ b/easybuild/easyconfigs/l/libX11/libX11-1.6.3-intel-2015a-Python-2.7.10.eb
@@ -7,7 +7,7 @@ versionsuffix = '-Python-2.7.10'
 homepage = "http://www.freedesktop.org/wiki/Software/xlibs"
 description = """X11 client-side library"""
 
-toolchain = {'name': 'intel', 'version': '2015a'} 
+toolchain = {'name': 'intel', 'version': '2015a'}
 
 sources = [SOURCE_TAR_GZ]
 source_urls = [XORG_LIB_SOURCE]
diff --git a/easybuild/easyconfigs/l/libX11/libX11-1.6.3-intel-2015a-Python-2.7.9.eb b/easybuild/easyconfigs/l/libX11/libX11-1.6.3-intel-2015a-Python-2.7.9.eb
index aec9e4570d8..fa0d2300e62 100644
--- a/easybuild/easyconfigs/l/libX11/libX11-1.6.3-intel-2015a-Python-2.7.9.eb
+++ b/easybuild/easyconfigs/l/libX11/libX11-1.6.3-intel-2015a-Python-2.7.9.eb
@@ -7,7 +7,7 @@ versionsuffix = '-Python-2.7.9'
 homepage = "http://www.freedesktop.org/wiki/Software/xlibs"
 description = """X11 client-side library"""
 
-toolchain = {'name': 'intel', 'version': '2015a'} 
+toolchain = {'name': 'intel', 'version': '2015a'}
 
 sources = [SOURCE_TAR_GZ]
 source_urls = [XORG_LIB_SOURCE]
diff --git a/easybuild/easyconfigs/l/libX11/libX11-1.6.3-intel-2015b-Python-2.7.10.eb b/easybuild/easyconfigs/l/libX11/libX11-1.6.3-intel-2015b-Python-2.7.10.eb
index 81992bc4753..90a1e61002a 100644
--- a/easybuild/easyconfigs/l/libX11/libX11-1.6.3-intel-2015b-Python-2.7.10.eb
+++ b/easybuild/easyconfigs/l/libX11/libX11-1.6.3-intel-2015b-Python-2.7.10.eb
@@ -7,7 +7,7 @@ versionsuffix = '-Python-2.7.10'
 homepage = "http://www.freedesktop.org/wiki/Software/xlibs"
 description = """X11 client-side library"""
 
-toolchain = {'name': 'intel', 'version': '2015b'} 
+toolchain = {'name': 'intel', 'version': '2015b'}
 
 sources = [SOURCE_TAR_GZ]
 source_urls = [XORG_LIB_SOURCE]
diff --git a/easybuild/easyconfigs/l/libX11/libX11-1.6.3-intel-2015b-Python-2.7.11.eb b/easybuild/easyconfigs/l/libX11/libX11-1.6.3-intel-2015b-Python-2.7.11.eb
index 061bf0062c0..ce11a9ade31 100644
--- a/easybuild/easyconfigs/l/libX11/libX11-1.6.3-intel-2015b-Python-2.7.11.eb
+++ b/easybuild/easyconfigs/l/libX11/libX11-1.6.3-intel-2015b-Python-2.7.11.eb
@@ -7,7 +7,7 @@ versionsuffix = '-Python-2.7.11'
 homepage = "http://www.freedesktop.org/wiki/Software/xlibs"
 description = """X11 client-side library"""
 
-toolchain = {'name': 'intel', 'version': '2015b'} 
+toolchain = {'name': 'intel', 'version': '2015b'}
 
 sources = [SOURCE_TAR_GZ]
 source_urls = [XORG_LIB_SOURCE]
diff --git a/easybuild/easyconfigs/l/libdap/libdap-3.14.0-intel-2015a-Python-2.7.10.eb b/easybuild/easyconfigs/l/libdap/libdap-3.14.0-intel-2015a-Python-2.7.10.eb
index f396c996d12..63172f59f4d 100644
--- a/easybuild/easyconfigs/l/libdap/libdap-3.14.0-intel-2015a-Python-2.7.10.eb
+++ b/easybuild/easyconfigs/l/libdap/libdap-3.14.0-intel-2015a-Python-2.7.10.eb
@@ -2,7 +2,7 @@ easyblock = 'ConfigureMake'
 
 name = 'libdap'
 version = '3.14.0'
-versionsuffix = "-Python-2.7.10" 
+versionsuffix = "-Python-2.7.10"
 
 homepage = 'http://opendap.org/download/libdap'
 description = """A C++ SDK which contains an implementation of DAP 2.0
diff --git a/easybuild/easyconfigs/l/libdap/libdap-3.14.0-intel-2015b-Python-2.7.10.eb b/easybuild/easyconfigs/l/libdap/libdap-3.14.0-intel-2015b-Python-2.7.10.eb
index ab0f0f65d02..f70b2b33c48 100644
--- a/easybuild/easyconfigs/l/libdap/libdap-3.14.0-intel-2015b-Python-2.7.10.eb
+++ b/easybuild/easyconfigs/l/libdap/libdap-3.14.0-intel-2015b-Python-2.7.10.eb
@@ -2,7 +2,7 @@ easyblock = 'ConfigureMake'
 
 name = 'libdap'
 version = '3.14.0'
-versionsuffix = "-Python-2.7.10" 
+versionsuffix = "-Python-2.7.10"
 
 homepage = 'http://opendap.org/download/libdap'
 description = """A C++ SDK which contains an implementation of DAP 2.0
diff --git a/easybuild/easyconfigs/l/libpthread-stubs/libpthread-stubs-0.3-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/l/libpthread-stubs/libpthread-stubs-0.3-goalf-1.1.0-no-OFED.eb
index f829f915ab6..9739f76ef1f 100644
--- a/easybuild/easyconfigs/l/libpthread-stubs/libpthread-stubs-0.3-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/l/libpthread-stubs/libpthread-stubs-0.3-goalf-1.1.0-no-OFED.eb
@@ -14,7 +14,7 @@ toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
 
 sanity_check_paths = {
                       'files' : ['lib/pkgconfig/pthread-stubs.pc'],
-                      'dirs': [] 
+                      'dirs': []
                      }
 
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libpthread-stubs/libpthread-stubs-0.3-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libpthread-stubs/libpthread-stubs-0.3-goolf-1.4.10.eb
index 1b25208919d..1a74d61a74a 100644
--- a/easybuild/easyconfigs/l/libpthread-stubs/libpthread-stubs-0.3-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/l/libpthread-stubs/libpthread-stubs-0.3-goolf-1.4.10.eb
@@ -13,7 +13,7 @@ toolchain = {'name': 'goolf', 'version': '1.4.10'}
 
 sanity_check_paths = {
                       'files' : ['lib/pkgconfig/pthread-stubs.pc'],
-                      'dirs': [] 
+                      'dirs': []
                      }
 
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libpthread-stubs/libpthread-stubs-0.3-ictce-4.0.6.eb b/easybuild/easyconfigs/l/libpthread-stubs/libpthread-stubs-0.3-ictce-4.0.6.eb
index 9f980a8c825..f71c39521be 100644
--- a/easybuild/easyconfigs/l/libpthread-stubs/libpthread-stubs-0.3-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/l/libpthread-stubs/libpthread-stubs-0.3-ictce-4.0.6.eb
@@ -14,7 +14,7 @@ toolchain = {'name': 'ictce', 'version': '4.0.6'}
 
 sanity_check_paths = {
                       'files' : ['lib/pkgconfig/pthread-stubs.pc'],
-                      'dirs': [] 
+                      'dirs': []
                      }
 
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libpthread-stubs/libpthread-stubs-0.3-ictce-5.3.0.eb b/easybuild/easyconfigs/l/libpthread-stubs/libpthread-stubs-0.3-ictce-5.3.0.eb
index 1c780648c6c..8789568941c 100644
--- a/easybuild/easyconfigs/l/libpthread-stubs/libpthread-stubs-0.3-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/l/libpthread-stubs/libpthread-stubs-0.3-ictce-5.3.0.eb
@@ -15,7 +15,7 @@ toolchain = {'name': 'ictce', 'version': '5.3.0'}
 
 sanity_check_paths = {
                       'files' : ['lib/pkgconfig/pthread-stubs.pc'],
-                      'dirs': [] 
+                      'dirs': []
                      }
 
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libtool/libtool-2.4.2-GCC-4.9.2.eb b/easybuild/easyconfigs/l/libtool/libtool-2.4.2-GCC-4.9.2.eb
index fdeaf140c10..a0d2e1edbd2 100644
--- a/easybuild/easyconfigs/l/libtool/libtool-2.4.2-GCC-4.9.2.eb
+++ b/easybuild/easyconfigs/l/libtool/libtool-2.4.2-GCC-4.9.2.eb
@@ -7,7 +7,7 @@ homepage = 'http://www.gnu.org/software/libtool'
 description = """GNU libtool is a generic library support script. Libtool hides the complexity of using shared libraries
  behind a consistent, portable interface."""
 
-toolchain = {'name': 'GCC', 'version': '4.9.2'} 
+toolchain = {'name': 'GCC', 'version': '4.9.2'}
 
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = [GNU_SOURCE]
diff --git a/easybuild/easyconfigs/l/libtool/libtool-2.4.5-GCC-4.9.2.eb b/easybuild/easyconfigs/l/libtool/libtool-2.4.5-GCC-4.9.2.eb
index a0c6a258a80..51c79ac40ab 100644
--- a/easybuild/easyconfigs/l/libtool/libtool-2.4.5-GCC-4.9.2.eb
+++ b/easybuild/easyconfigs/l/libtool/libtool-2.4.5-GCC-4.9.2.eb
@@ -7,7 +7,7 @@ homepage = 'http://www.gnu.org/software/libtool'
 description = """GNU libtool is a generic library support script. Libtool hides the complexity of using shared libraries
  behind a consistent, portable interface."""
 
-toolchain = {'name': 'GCC', 'version': '4.9.2'} 
+toolchain = {'name': 'GCC', 'version': '4.9.2'}
 
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = [GNU_SOURCE]
diff --git a/easybuild/easyconfigs/l/libtool/libtool-2.4.5-intel-2015a.eb b/easybuild/easyconfigs/l/libtool/libtool-2.4.5-intel-2015a.eb
index a0bfd7ae8e2..dd9022e00e8 100644
--- a/easybuild/easyconfigs/l/libtool/libtool-2.4.5-intel-2015a.eb
+++ b/easybuild/easyconfigs/l/libtool/libtool-2.4.5-intel-2015a.eb
@@ -7,7 +7,7 @@ homepage = 'http://www.gnu.org/software/libtool'
 description = """GNU libtool is a generic library support script. Libtool hides the complexity of using shared libraries
  behind a consistent, portable interface."""
 
-toolchain = {'name': 'intel', 'version': '2015a'} 
+toolchain = {'name': 'intel', 'version': '2015a'}
 
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = [GNU_SOURCE]
diff --git a/easybuild/easyconfigs/l/libtool/libtool-2.4.6-GNU-4.9.2-2.25.eb b/easybuild/easyconfigs/l/libtool/libtool-2.4.6-GNU-4.9.2-2.25.eb
index f29d89e1c6f..6daa86f14ec 100644
--- a/easybuild/easyconfigs/l/libtool/libtool-2.4.6-GNU-4.9.2-2.25.eb
+++ b/easybuild/easyconfigs/l/libtool/libtool-2.4.6-GNU-4.9.2-2.25.eb
@@ -7,7 +7,7 @@ homepage = 'http://www.gnu.org/software/libtool'
 description = """GNU libtool is a generic library support script. Libtool hides the complexity of using shared libraries
  behind a consistent, portable interface."""
 
-toolchain = {'name': 'GNU', 'version': '4.9.2-2.25'} 
+toolchain = {'name': 'GNU', 'version': '4.9.2-2.25'}
 
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = [GNU_SOURCE]
diff --git a/easybuild/easyconfigs/l/libtool/libtool-2.4.6-GNU-4.9.3-2.25.eb b/easybuild/easyconfigs/l/libtool/libtool-2.4.6-GNU-4.9.3-2.25.eb
index 99efd1e7966..71431016056 100644
--- a/easybuild/easyconfigs/l/libtool/libtool-2.4.6-GNU-4.9.3-2.25.eb
+++ b/easybuild/easyconfigs/l/libtool/libtool-2.4.6-GNU-4.9.3-2.25.eb
@@ -7,7 +7,7 @@ homepage = 'http://www.gnu.org/software/libtool'
 description = """GNU libtool is a generic library support script. Libtool hides the complexity of using shared libraries
  behind a consistent, portable interface."""
 
-toolchain = {'name': 'GNU', 'version': '4.9.3-2.25'} 
+toolchain = {'name': 'GNU', 'version': '4.9.3-2.25'}
 
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = [GNU_SOURCE]
diff --git a/easybuild/easyconfigs/l/libtool/libtool-2.4.6-GNU-5.1.0-2.25.eb b/easybuild/easyconfigs/l/libtool/libtool-2.4.6-GNU-5.1.0-2.25.eb
index 33c6f3867ed..290aa77f300 100644
--- a/easybuild/easyconfigs/l/libtool/libtool-2.4.6-GNU-5.1.0-2.25.eb
+++ b/easybuild/easyconfigs/l/libtool/libtool-2.4.6-GNU-5.1.0-2.25.eb
@@ -7,7 +7,7 @@ homepage = 'http://www.gnu.org/software/libtool'
 description = """GNU libtool is a generic library support script. Libtool hides the complexity of using shared libraries
  behind a consistent, portable interface."""
 
-toolchain = {'name': 'GNU', 'version': '5.1.0-2.25'} 
+toolchain = {'name': 'GNU', 'version': '5.1.0-2.25'}
 
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = [GNU_SOURCE]
diff --git a/easybuild/easyconfigs/l/libxcb/libxcb-1.10-intel-2014b-Python-2.7.8.eb b/easybuild/easyconfigs/l/libxcb/libxcb-1.10-intel-2014b-Python-2.7.8.eb
index 1ae3d3fbc40..930f6a164fd 100644
--- a/easybuild/easyconfigs/l/libxcb/libxcb-1.10-intel-2014b-Python-2.7.8.eb
+++ b/easybuild/easyconfigs/l/libxcb/libxcb-1.10-intel-2014b-Python-2.7.8.eb
@@ -7,7 +7,7 @@ homepage = 'http://xcb.freedesktop.org/'
 description = """The X protocol C-language Binding (XCB) is a replacement for Xlib featuring a small footprint,
 latency hiding, direct access to the protocol, improved threading support, and extensibility."""
 
-toolchain = {'name': 'intel', 'version': '2014b'} 
+toolchain = {'name': 'intel', 'version': '2014b'}
 
 source_urls  = ['http://xcb.freedesktop.org/dist/']
 sources = [SOURCELOWER_TAR_GZ]
diff --git a/easybuild/easyconfigs/l/libxcb/libxcb-1.11-intel-2015a-Python-2.7.10.eb b/easybuild/easyconfigs/l/libxcb/libxcb-1.11-intel-2015a-Python-2.7.10.eb
index c1b10ef129b..09a13b616da 100644
--- a/easybuild/easyconfigs/l/libxcb/libxcb-1.11-intel-2015a-Python-2.7.10.eb
+++ b/easybuild/easyconfigs/l/libxcb/libxcb-1.11-intel-2015a-Python-2.7.10.eb
@@ -7,7 +7,7 @@ homepage = 'http://xcb.freedesktop.org/'
 description = """The X protocol C-language Binding (XCB) is a replacement for Xlib featuring a small footprint,
 latency hiding, direct access to the protocol, improved threading support, and extensibility."""
 
-toolchain = {'name': 'intel', 'version': '2015a'} 
+toolchain = {'name': 'intel', 'version': '2015a'}
 
 source_urls  = ['http://xcb.freedesktop.org/dist/']
 sources = [SOURCELOWER_TAR_GZ]
diff --git a/easybuild/easyconfigs/l/libxcb/libxcb-1.11-intel-2015a-Python-2.7.9.eb b/easybuild/easyconfigs/l/libxcb/libxcb-1.11-intel-2015a-Python-2.7.9.eb
index 7d200384127..68acb79d5bf 100644
--- a/easybuild/easyconfigs/l/libxcb/libxcb-1.11-intel-2015a-Python-2.7.9.eb
+++ b/easybuild/easyconfigs/l/libxcb/libxcb-1.11-intel-2015a-Python-2.7.9.eb
@@ -7,7 +7,7 @@ homepage = 'http://xcb.freedesktop.org/'
 description = """The X protocol C-language Binding (XCB) is a replacement for Xlib featuring a small footprint,
 latency hiding, direct access to the protocol, improved threading support, and extensibility."""
 
-toolchain = {'name': 'intel', 'version': '2015a'} 
+toolchain = {'name': 'intel', 'version': '2015a'}
 
 source_urls  = ['http://xcb.freedesktop.org/dist/']
 sources = [SOURCELOWER_TAR_GZ]
diff --git a/easybuild/easyconfigs/l/libxcb/libxcb-1.11.1-intel-2015b-Python-2.7.10.eb b/easybuild/easyconfigs/l/libxcb/libxcb-1.11.1-intel-2015b-Python-2.7.10.eb
index d5d178d52d4..482b2014e9d 100644
--- a/easybuild/easyconfigs/l/libxcb/libxcb-1.11.1-intel-2015b-Python-2.7.10.eb
+++ b/easybuild/easyconfigs/l/libxcb/libxcb-1.11.1-intel-2015b-Python-2.7.10.eb
@@ -7,7 +7,7 @@ homepage = 'http://xcb.freedesktop.org/'
 description = """The X protocol C-language Binding (XCB) is a replacement for Xlib featuring a small footprint,
 latency hiding, direct access to the protocol, improved threading support, and extensibility."""
 
-toolchain = {'name': 'intel', 'version': '2015b'} 
+toolchain = {'name': 'intel', 'version': '2015b'}
 
 source_urls  = ['http://xcb.freedesktop.org/dist/']
 sources = [SOURCELOWER_TAR_GZ]
diff --git a/easybuild/easyconfigs/l/libxcb/libxcb-1.11.1-intel-2015b-Python-2.7.11.eb b/easybuild/easyconfigs/l/libxcb/libxcb-1.11.1-intel-2015b-Python-2.7.11.eb
index b3c206c1f55..c9239b151b5 100644
--- a/easybuild/easyconfigs/l/libxcb/libxcb-1.11.1-intel-2015b-Python-2.7.11.eb
+++ b/easybuild/easyconfigs/l/libxcb/libxcb-1.11.1-intel-2015b-Python-2.7.11.eb
@@ -7,7 +7,7 @@ homepage = 'http://xcb.freedesktop.org/'
 description = """The X protocol C-language Binding (XCB) is a replacement for Xlib featuring a small footprint,
 latency hiding, direct access to the protocol, improved threading support, and extensibility."""
 
-toolchain = {'name': 'intel', 'version': '2015b'} 
+toolchain = {'name': 'intel', 'version': '2015b'}
 
 source_urls  = ['http://xcb.freedesktop.org/dist/']
 sources = [SOURCELOWER_TAR_GZ]
diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.16-goolf-1.5.14.eb b/easybuild/easyconfigs/m/M4/M4-1.4.16-goolf-1.5.14.eb
index b2b44741465..0cb44a3cfb2 100644
--- a/easybuild/easyconfigs/m/M4/M4-1.4.16-goolf-1.5.14.eb
+++ b/easybuild/easyconfigs/m/M4/M4-1.4.16-goolf-1.5.14.eb
@@ -10,7 +10,7 @@ It is mostly SVR4 compatible although it has some extensions
 GNU M4 also has built-in functions for including files, running shell commands, doing arithmetic, etc.
 """
 
-toolchain = {'name': 'goolf', 'version': '1.5.14'} 
+toolchain = {'name': 'goolf', 'version': '1.5.14'}
 
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = [GNU_SOURCE]
diff --git a/easybuild/easyconfigs/m/Mesa/Mesa-10.4.5-intel-2015a-Python-2.7.9.eb b/easybuild/easyconfigs/m/Mesa/Mesa-10.4.5-intel-2015a-Python-2.7.9.eb
index f7031627000..9fed17ec40c 100644
--- a/easybuild/easyconfigs/m/Mesa/Mesa-10.4.5-intel-2015a-Python-2.7.9.eb
+++ b/easybuild/easyconfigs/m/Mesa/Mesa-10.4.5-intel-2015a-Python-2.7.9.eb
@@ -35,7 +35,7 @@ builddependencies = [
     ('glproto', '1.4.17'),
     ('M4', '1.4.17')
 ]
- 
+
 dependencies = [
     ('Python', pythonver),
     ('libxml2', '2.9.2', versionsuffix),
diff --git a/easybuild/easyconfigs/m/Mesa/Mesa-7.11.2-goalf-1.1.0-no-OFED-Python-2.7.3.eb b/easybuild/easyconfigs/m/Mesa/Mesa-7.11.2-goalf-1.1.0-no-OFED-Python-2.7.3.eb
index 8493b404370..071c95fba21 100644
--- a/easybuild/easyconfigs/m/Mesa/Mesa-7.11.2-goalf-1.1.0-no-OFED-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/m/Mesa/Mesa-7.11.2-goalf-1.1.0-no-OFED-Python-2.7.3.eb
@@ -33,8 +33,8 @@ dependencies = [
 osdependencies = [
             'libX11-devel',  # Xlibs.h
             'xorg-x11-proto-devel',  # X.h, glproto, xproto
-            'libXdamage-devel', 
-            'libXext-devel', 
+            'libXdamage-devel',
+            'libXext-devel',
             'libXfixes-devel',
         ]
 
@@ -46,7 +46,7 @@ preconfigopts = ' PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/lib64/pkgconfig/:/usr/s
 
 prebuildopts = 'CPATH="$EBROOTLIBDRM/include/libdrm" '
 
-sanity_check_paths = { 
+sanity_check_paths = {
     'files': ['lib/libGL.%s' % SHLIB_EXT, 'lib/libGLU.%s' % SHLIB_EXT, 'include/GL/glext.h', 'include/GL/gl_mangle.h',
               'include/GL/glu_mangle.h', 'include/GL/glx.h', 'include/GL/osmesa.h', 'include/GL/wglext.h',
               'include/GL/gl.h', 'include/GL/glu.h', 'include/GL/glxext.h', 'include/GL/glx_mangle.h',
diff --git a/easybuild/easyconfigs/m/Mesa/Mesa-7.11.2-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/m/Mesa/Mesa-7.11.2-goolf-1.4.10-Python-2.7.3.eb
index dae84ea70b2..3fa0d3f751f 100644
--- a/easybuild/easyconfigs/m/Mesa/Mesa-7.11.2-goolf-1.4.10-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/m/Mesa/Mesa-7.11.2-goolf-1.4.10-Python-2.7.3.eb
@@ -32,8 +32,8 @@ dependencies = [
 osdependencies = [
             'libX11-devel',  # Xlibs.h
             'xorg-x11-proto-devel',  # X.h, glproto, xproto
-            'libXdamage-devel', 
-            'libXext-devel', 
+            'libXdamage-devel',
+            'libXext-devel',
             'libXfixes-devel',
         ]
 
@@ -45,7 +45,7 @@ preconfigopts = ' PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/lib64/pkgconfig/:/usr/s
 
 prebuildopts = 'CPATH="$EBROOTLIBDRM/include/libdrm" '
 
-sanity_check_paths = { 
+sanity_check_paths = {
     'files': ['lib/libGL.%s' % SHLIB_EXT, 'lib/libGLU.%s' % SHLIB_EXT, 'include/GL/glext.h', 'include/GL/gl_mangle.h',
               'include/GL/glu_mangle.h', 'include/GL/glx.h', 'include/GL/osmesa.h', 'include/GL/wglext.h',
               'include/GL/gl.h', 'include/GL/glu.h', 'include/GL/glxext.h', 'include/GL/glx_mangle.h',
diff --git a/easybuild/easyconfigs/m/Mesa/Mesa-7.11.2-ictce-4.0.6-Python-2.7.3.eb b/easybuild/easyconfigs/m/Mesa/Mesa-7.11.2-ictce-4.0.6-Python-2.7.3.eb
index ce1d47d02a2..864dc0bea30 100644
--- a/easybuild/easyconfigs/m/Mesa/Mesa-7.11.2-ictce-4.0.6-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/m/Mesa/Mesa-7.11.2-ictce-4.0.6-Python-2.7.3.eb
@@ -33,8 +33,8 @@ dependencies = [
 osdependencies = [
             'libX11-devel',  # Xlibs.h
             'xorg-x11-proto-devel',  # X.h, glproto, xproto
-            'libXdamage-devel', 
-            'libXext-devel', 
+            'libXdamage-devel',
+            'libXext-devel',
             'libXfixes-devel',
         ]
 
@@ -46,7 +46,7 @@ preconfigopts = ' PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/lib64/pkgconfig/:/usr/s
 
 prebuildopts = 'CPATH="$EBROOTLIBDRM/include/libdrm" '
 
-sanity_check_paths = { 
+sanity_check_paths = {
     'files': ['lib/libGL.%s' % SHLIB_EXT, 'lib/libGLU.%s' % SHLIB_EXT, 'include/GL/glext.h', 'include/GL/gl_mangle.h',
               'include/GL/glu_mangle.h', 'include/GL/glx.h', 'include/GL/osmesa.h', 'include/GL/wglext.h',
               'include/GL/gl.h', 'include/GL/glu.h', 'include/GL/glxext.h', 'include/GL/glx_mangle.h',
diff --git a/easybuild/easyconfigs/m/Mesa/Mesa-7.11.2-ictce-4.1.13-Python-2.7.3.eb b/easybuild/easyconfigs/m/Mesa/Mesa-7.11.2-ictce-4.1.13-Python-2.7.3.eb
index 490f0bad9f4..4ae1b349117 100644
--- a/easybuild/easyconfigs/m/Mesa/Mesa-7.11.2-ictce-4.1.13-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/m/Mesa/Mesa-7.11.2-ictce-4.1.13-Python-2.7.3.eb
@@ -33,8 +33,8 @@ dependencies = [
 osdependencies = [
     'libX11-devel',  # Xlibs.h
     'xorg-x11-proto-devel',  # X.h, glproto, xproto
-    'libXdamage-devel', 
-    'libXext-devel', 
+    'libXdamage-devel',
+    'libXext-devel',
     'libXfixes-devel',
 ]
 
@@ -46,7 +46,7 @@ preconfigopts = ' PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/lib64/pkgconfig/:/usr/s
 
 prebuildopts = 'CPATH="$EBROOTLIBDRM/include/libdrm" '
 
-sanity_check_paths = { 
+sanity_check_paths = {
     'files': ['lib/libGL.%s' % SHLIB_EXT, 'lib/libGLU.%s' % SHLIB_EXT, 'include/GL/glext.h', 'include/GL/gl_mangle.h',
               'include/GL/glu_mangle.h', 'include/GL/glx.h', 'include/GL/osmesa.h', 'include/GL/wglext.h',
               'include/GL/gl.h', 'include/GL/glu.h', 'include/GL/glxext.h', 'include/GL/glx_mangle.h',
diff --git a/easybuild/easyconfigs/m/Mesa/Mesa-7.11.2-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/m/Mesa/Mesa-7.11.2-ictce-5.3.0-Python-2.7.3.eb
index 226d771609d..8f7b8fd9e18 100644
--- a/easybuild/easyconfigs/m/Mesa/Mesa-7.11.2-ictce-5.3.0-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/m/Mesa/Mesa-7.11.2-ictce-5.3.0-Python-2.7.3.eb
@@ -34,8 +34,8 @@ dependencies = [
 osdependencies = [
             'libX11-devel',  # Xlibs.h
             'xorg-x11-proto-devel',  # X.h, glproto, xproto
-            'libXdamage-devel', 
-            'libXext-devel', 
+            'libXdamage-devel',
+            'libXext-devel',
             'libXfixes-devel',
         ]
 
@@ -47,7 +47,7 @@ preconfigopts = ' PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/lib64/pkgconfig/:/usr/s
 
 prebuildopts = 'CPATH="$EBROOTLIBDRM/include/libdrm" '
 
-sanity_check_paths = { 
+sanity_check_paths = {
     'files': ['lib/libGL.%s' % SHLIB_EXT, 'lib/libGLU.%s' % SHLIB_EXT, 'include/GL/glext.h', 'include/GL/gl_mangle.h',
               'include/GL/glu_mangle.h', 'include/GL/glx.h', 'include/GL/osmesa.h', 'include/GL/wglext.h',
               'include/GL/gl.h', 'include/GL/glu.h', 'include/GL/glxext.h', 'include/GL/glx_mangle.h',
diff --git a/easybuild/easyconfigs/m/MethPipe/MethPipe-3.0.1-goolf-1.4.10.eb b/easybuild/easyconfigs/m/MethPipe/MethPipe-3.0.1-goolf-1.4.10.eb
index 852c1e30669..5ee01321f8a 100644
--- a/easybuild/easyconfigs/m/MethPipe/MethPipe-3.0.1-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/m/MethPipe/MethPipe-3.0.1-goolf-1.4.10.eb
@@ -32,8 +32,8 @@ files_to_copy = ["bin", "docs"]
 
 sanity_check_paths = {
     'files': ["bin/%s" % x for x in ["allelicmeth", "amrfinder", "amrtester", "bsrate", "dmr",
-                                     "duplicate-remover", "hmr", "hmr_plant", "lc_approx","levels", 
-                                     "merge-bsrate", "merge-methcounts", "methcounts","methdiff", 
+                                     "duplicate-remover", "hmr", "hmr_plant", "lc_approx","levels",
+                                     "merge-bsrate", "merge-methcounts", "methcounts","methdiff",
                                      "methstates", "pmd", "rmapbs", "rmapbs-pe", "roimethstat", "to-mr"]],
     'dirs': ['docs'],
 }
diff --git a/easybuild/easyconfigs/m/MethPipe/MethPipe-3.0.1-intel-2014b.eb b/easybuild/easyconfigs/m/MethPipe/MethPipe-3.0.1-intel-2014b.eb
index 2c109b35572..546db6338aa 100644
--- a/easybuild/easyconfigs/m/MethPipe/MethPipe-3.0.1-intel-2014b.eb
+++ b/easybuild/easyconfigs/m/MethPipe/MethPipe-3.0.1-intel-2014b.eb
@@ -32,8 +32,8 @@ files_to_copy = ["bin", "docs"]
 
 sanity_check_paths = {
     'files': ["bin/%s" % x for x in ["allelicmeth", "amrfinder", "amrtester", "bsrate", "dmr",
-                                     "duplicate-remover", "hmr", "hmr_plant", "lc_approx","levels", 
-                                     "merge-bsrate", "merge-methcounts", "methcounts","methdiff", 
+                                     "duplicate-remover", "hmr", "hmr_plant", "lc_approx","levels",
+                                     "merge-bsrate", "merge-methcounts", "methcounts","methdiff",
                                      "methstates", "pmd", "rmapbs", "rmapbs-pe", "roimethstat", "to-mr"]],
     'dirs': ['docs'],
 }
diff --git a/easybuild/easyconfigs/m/makedepend/makedepend-1.0.4-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/m/makedepend/makedepend-1.0.4-goalf-1.1.0-no-OFED.eb
index 10d8f0fdb3e..529c59d6aba 100644
--- a/easybuild/easyconfigs/m/makedepend/makedepend-1.0.4-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/m/makedepend/makedepend-1.0.4-goalf-1.1.0-no-OFED.eb
@@ -12,7 +12,7 @@ toolchainopts = {'optarch': True}
 sources = [SOURCE_TAR_GZ]
 source_urls = ['http://xorg.freedesktop.org/releases/individual/util']
 
-sanity_check_paths = { 
+sanity_check_paths = {
     'files': ['bin/makedepend'],
     'dirs': [],
 }
diff --git a/easybuild/easyconfigs/m/makedepend/makedepend-1.0.4-goolf-1.4.10.eb b/easybuild/easyconfigs/m/makedepend/makedepend-1.0.4-goolf-1.4.10.eb
index ff1abe68936..df5d7baa125 100644
--- a/easybuild/easyconfigs/m/makedepend/makedepend-1.0.4-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/m/makedepend/makedepend-1.0.4-goolf-1.4.10.eb
@@ -11,7 +11,7 @@ toolchainopts = {'optarch': True}
 sources = [SOURCE_TAR_GZ]
 source_urls = ['http://xorg.freedesktop.org/releases/individual/util']
 
-sanity_check_paths = { 
+sanity_check_paths = {
     'files': ['bin/makedepend'],
     'dirs': [],
 }
diff --git a/easybuild/easyconfigs/m/makedepend/makedepend-1.0.4-ictce-3.2.2.u3.eb b/easybuild/easyconfigs/m/makedepend/makedepend-1.0.4-ictce-3.2.2.u3.eb
index 790eefcde4e..3d0c89f8f22 100644
--- a/easybuild/easyconfigs/m/makedepend/makedepend-1.0.4-ictce-3.2.2.u3.eb
+++ b/easybuild/easyconfigs/m/makedepend/makedepend-1.0.4-ictce-3.2.2.u3.eb
@@ -14,7 +14,7 @@ source_urls = ['http://xorg.freedesktop.org/releases/individual/util']
 
 patches = ['makedepend_icc-sigaction.patch']
 
-sanity_check_paths = { 
+sanity_check_paths = {
     'files': ['bin/makedepend'],
     'dirs': [],
 }
diff --git a/easybuild/easyconfigs/m/makedepend/makedepend-1.0.4-ictce-4.0.6.eb b/easybuild/easyconfigs/m/makedepend/makedepend-1.0.4-ictce-4.0.6.eb
index 94b2544e16b..fa3bc9877b6 100644
--- a/easybuild/easyconfigs/m/makedepend/makedepend-1.0.4-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/m/makedepend/makedepend-1.0.4-ictce-4.0.6.eb
@@ -12,7 +12,7 @@ toolchainopts = {'optarch': True}
 sources = [SOURCE_TAR_GZ]
 source_urls = ['http://xorg.freedesktop.org/releases/individual/util']
 
-sanity_check_paths = { 
+sanity_check_paths = {
     'files': ['bin/makedepend'],
     'dirs': [],
 }
diff --git a/easybuild/easyconfigs/m/makedepend/makedepend-1.0.4-ictce-4.1.13.eb b/easybuild/easyconfigs/m/makedepend/makedepend-1.0.4-ictce-4.1.13.eb
index c0f71c373d4..3f3fa2cba5d 100644
--- a/easybuild/easyconfigs/m/makedepend/makedepend-1.0.4-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/m/makedepend/makedepend-1.0.4-ictce-4.1.13.eb
@@ -12,7 +12,7 @@ toolchainopts = {'optarch': True}
 sources = [SOURCE_TAR_GZ]
 source_urls = ['http://xorg.freedesktop.org/releases/individual/util']
 
-sanity_check_paths = { 
+sanity_check_paths = {
     'files': ['bin/makedepend'],
     'dirs': [],
 }
diff --git a/easybuild/easyconfigs/m/makedepend/makedepend-1.0.4-ictce-5.3.0.eb b/easybuild/easyconfigs/m/makedepend/makedepend-1.0.4-ictce-5.3.0.eb
index 39683b811c0..653ce13c66c 100644
--- a/easybuild/easyconfigs/m/makedepend/makedepend-1.0.4-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/m/makedepend/makedepend-1.0.4-ictce-5.3.0.eb
@@ -13,7 +13,7 @@ toolchainopts = {'optarch': True}
 sources = [SOURCE_TAR_GZ]
 source_urls = ['http://xorg.freedesktop.org/releases/individual/util']
 
-sanity_check_paths = { 
+sanity_check_paths = {
     'files': ['bin/makedepend'],
     'dirs': [],
 }
diff --git a/easybuild/easyconfigs/m/makedepend/makedepend-1.0.4-iqacml-3.7.3.eb b/easybuild/easyconfigs/m/makedepend/makedepend-1.0.4-iqacml-3.7.3.eb
index 34e982133e2..a42c1e4ac5e 100644
--- a/easybuild/easyconfigs/m/makedepend/makedepend-1.0.4-iqacml-3.7.3.eb
+++ b/easybuild/easyconfigs/m/makedepend/makedepend-1.0.4-iqacml-3.7.3.eb
@@ -14,7 +14,7 @@ source_urls = ['http://xorg.freedesktop.org/releases/individual/util']
 
 patches = ['makedepend_icc-sigaction.patch']
 
-sanity_check_paths = { 
+sanity_check_paths = {
     'files': ['bin/makedepend'],
     'dirs': [],
 }
diff --git a/easybuild/easyconfigs/m/mdtest/mdtest-1.7.1-goolf-1.4.10.eb b/easybuild/easyconfigs/m/mdtest/mdtest-1.7.1-goolf-1.4.10.eb
index 6c2df30046b..f389f068078 100644
--- a/easybuild/easyconfigs/m/mdtest/mdtest-1.7.1-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/m/mdtest/mdtest-1.7.1-goolf-1.4.10.eb
@@ -25,8 +25,8 @@ parallel = 1
 buildopts = ' CC="$CC"'
 
 files_to_copy = [
-        (['mdtest'], 'bin'), 
-        "README", 
+        (['mdtest'], 'bin'),
+        "README",
         "COPYRIGHT",
 ]
 
diff --git a/easybuild/easyconfigs/m/mdtest/mdtest-1.7.1-ictce-6.2.5.eb b/easybuild/easyconfigs/m/mdtest/mdtest-1.7.1-ictce-6.2.5.eb
index d5a5cb84d43..9444c160fda 100644
--- a/easybuild/easyconfigs/m/mdtest/mdtest-1.7.1-ictce-6.2.5.eb
+++ b/easybuild/easyconfigs/m/mdtest/mdtest-1.7.1-ictce-6.2.5.eb
@@ -25,8 +25,8 @@ parallel = 1
 buildopts = ' CC="$CC"'
 
 files_to_copy = [
-        (['mdtest'], 'bin'), 
-        "README", 
+        (['mdtest'], 'bin'),
+        "README",
         "COPYRIGHT",
 ]
 
diff --git a/easybuild/easyconfigs/m/mdtest/mdtest-1.9.3-goolf-1.4.10.eb b/easybuild/easyconfigs/m/mdtest/mdtest-1.9.3-goolf-1.4.10.eb
index aaa35151508..a7dcc82e624 100644
--- a/easybuild/easyconfigs/m/mdtest/mdtest-1.9.3-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/m/mdtest/mdtest-1.9.3-goolf-1.4.10.eb
@@ -25,9 +25,9 @@ parallel = 1
 buildopts = ' CC="$CC"'
 
 files_to_copy = [
-        (['mdtest'], 'bin'), 
-        (['mdtest.1'], 'man/man1'), 
-        "README", 
+        (['mdtest'], 'bin'),
+        (['mdtest.1'], 'man/man1'),
+        "README",
         "RELEASE_LOG",
         "scripts"
 ]
diff --git a/easybuild/easyconfigs/m/mdtest/mdtest-1.9.3-ictce-6.2.5.eb b/easybuild/easyconfigs/m/mdtest/mdtest-1.9.3-ictce-6.2.5.eb
index 28fb4bd0ad6..2085a445de5 100644
--- a/easybuild/easyconfigs/m/mdtest/mdtest-1.9.3-ictce-6.2.5.eb
+++ b/easybuild/easyconfigs/m/mdtest/mdtest-1.9.3-ictce-6.2.5.eb
@@ -25,9 +25,9 @@ parallel = 1
 buildopts = ' CC="$CC"'
 
 files_to_copy = [
-        (['mdtest'], 'bin'), 
-        (['mdtest.1'], 'man/man1'), 
-        "README", 
+        (['mdtest'], 'bin'),
+        (['mdtest.1'], 'man/man1'),
+        "README",
         "RELEASE_LOG",
         "scripts"
 ]
diff --git a/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-goalf-1.1.0-no-OFED-Python-2.7.3.eb b/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-goalf-1.1.0-no-OFED-Python-2.7.3.eb
index 98f6b375dfe..de5230e1fac 100644
--- a/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-goalf-1.1.0-no-OFED-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-goalf-1.1.0-no-OFED-Python-2.7.3.eb
@@ -14,7 +14,7 @@ source_urls = [
     GOOGLECODE_SOURCE,
 ]
 sources = [SOURCE_TAR_GZ]
-                                      
+
 python = 'Python'
 pyver = '2.7.3'
 versionsuffix = '-%s-%s' % (python, pyver)
diff --git a/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-goolf-1.4.10-Python-2.7.3.eb
index 58e1efec953..c04cd339fdf 100644
--- a/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-goolf-1.4.10-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-goolf-1.4.10-Python-2.7.3.eb
@@ -14,7 +14,7 @@ source_urls = [
     GOOGLECODE_SOURCE,
 ]
 sources = [SOURCE_TAR_GZ]
-                                      
+
 python = 'Python'
 pyver = '2.7.3'
 versionsuffix = '-%s-%s' % (python, pyver)
diff --git a/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-goolf-1.4.10-Python-3.2.3.eb b/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-goolf-1.4.10-Python-3.2.3.eb
index 8d1017dab1d..bc0d20fdcba 100644
--- a/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-goolf-1.4.10-Python-3.2.3.eb
+++ b/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-goolf-1.4.10-Python-3.2.3.eb
@@ -15,7 +15,7 @@ source_urls = [
     GOOGLECODE_SOURCE,
 ]
 sources = [SOURCE_TAR_GZ]
-                                      
+
 python = 'Python'
 pyver = '3.2.3'
 versionsuffix = '-%s-%s' % (python, pyver)
diff --git a/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-ictce-4.0.6-Python-2.7.3.eb b/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-ictce-4.0.6-Python-2.7.3.eb
index fff549de1f9..ad06de5d4f6 100644
--- a/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-ictce-4.0.6-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-ictce-4.0.6-Python-2.7.3.eb
@@ -14,7 +14,7 @@ source_urls = [
     GOOGLECODE_SOURCE,
 ]
 sources = [SOURCE_TAR_GZ]
-                                      
+
 python = 'Python'
 pyver = '2.7.3'
 versionsuffix = '-%s-%s' % (python, pyver)
diff --git a/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-ictce-4.1.13-Python-2.7.3.eb b/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-ictce-4.1.13-Python-2.7.3.eb
index 9fe2a5f319a..c69d7c6073c 100644
--- a/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-ictce-4.1.13-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-ictce-4.1.13-Python-2.7.3.eb
@@ -14,7 +14,7 @@ source_urls = [
     GOOGLECODE_SOURCE,
 ]
 sources = [SOURCE_TAR_GZ]
-                                      
+
 python = 'Python'
 pyver = '2.7.3'
 versionsuffix = '-%s-%s' % (python, pyver)
diff --git a/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-ictce-5.3.0-Python-2.7.3.eb
index eaf599c8ab0..94b5a9f2f87 100644
--- a/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-ictce-5.3.0-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-ictce-5.3.0-Python-2.7.3.eb
@@ -14,7 +14,7 @@ source_urls = [
     GOOGLECODE_SOURCE,
 ]
 sources = [SOURCE_TAR_GZ]
-                                      
+
 python = 'Python'
 pyver = '2.7.3'
 versionsuffix = '-%s-%s' % (python, pyver)
diff --git a/easybuild/easyconfigs/n/NCO/NCO-4.4.7-intel-2015b-Python-2.7.10.eb b/easybuild/easyconfigs/n/NCO/NCO-4.4.7-intel-2015b-Python-2.7.10.eb
index 5ddc8fef62c..b849d1d7ccc 100644
--- a/easybuild/easyconfigs/n/NCO/NCO-4.4.7-intel-2015b-Python-2.7.10.eb
+++ b/easybuild/easyconfigs/n/NCO/NCO-4.4.7-intel-2015b-Python-2.7.10.eb
@@ -16,7 +16,7 @@ description = """The NCO toolkit manipulates and analyzes data stored in netCDF-
 
 toolchain = {'name': 'intel', 'version': '2015b'}
 toolchainopts = {'cstd': 'c99'}
-  
+
 source_urls = [SOURCEFORGE_SOURCE]
 sources = [SOURCELOWER_TAR_GZ]
 
diff --git a/easybuild/easyconfigs/n/NCO/NCO-4.5.1-intel-2015a-Python-2.7.10.eb b/easybuild/easyconfigs/n/NCO/NCO-4.5.1-intel-2015a-Python-2.7.10.eb
index 3612474f0c5..a6ab3c607d6 100644
--- a/easybuild/easyconfigs/n/NCO/NCO-4.5.1-intel-2015a-Python-2.7.10.eb
+++ b/easybuild/easyconfigs/n/NCO/NCO-4.5.1-intel-2015a-Python-2.7.10.eb
@@ -16,7 +16,7 @@ description = """The NCO toolkit manipulates and analyzes data stored in netCDF-
 
 toolchain = {'name': 'intel', 'version': '2015a'}
 toolchainopts = {'cstd': 'c99'}
-  
+
 source_urls = [SOURCEFORGE_SOURCE]
 sources = [SOURCELOWER_TAR_GZ]
 
diff --git a/easybuild/easyconfigs/n/netCDF-Fortran/netCDF-Fortran-4.2-goolf-1.5.14.eb b/easybuild/easyconfigs/n/netCDF-Fortran/netCDF-Fortran-4.2-goolf-1.5.14.eb
index bd158f66c56..3d072019b1e 100644
--- a/easybuild/easyconfigs/n/netCDF-Fortran/netCDF-Fortran-4.2-goolf-1.5.14.eb
+++ b/easybuild/easyconfigs/n/netCDF-Fortran/netCDF-Fortran-4.2-goolf-1.5.14.eb
@@ -6,7 +6,7 @@ description = """NetCDF (network Common Data Form) is a set of software librarie
 and machine-independent data formats that support the creation, access, and sharing of array-oriented 
 scientific data."""
 
-toolchain = {'name': 'goolf', 'version': '1.5.14'} 
+toolchain = {'name': 'goolf', 'version': '1.5.14'}
 toolchainopts = {'pic': True}
 
 sources = [SOURCELOWER_TAR_GZ]
diff --git a/easybuild/easyconfigs/n/netCDF/netCDF-4.2.1.1-goolf-1.5.14.eb b/easybuild/easyconfigs/n/netCDF/netCDF-4.2.1.1-goolf-1.5.14.eb
index 45279737046..113ec9d3b84 100644
--- a/easybuild/easyconfigs/n/netCDF/netCDF-4.2.1.1-goolf-1.5.14.eb
+++ b/easybuild/easyconfigs/n/netCDF/netCDF-4.2.1.1-goolf-1.5.14.eb
@@ -6,7 +6,7 @@ description = """NetCDF (network Common Data Form) is a set of software librarie
  and machine-independent data formats that support the creation, access, and sharing of array-oriented 
  scientific data."""
 
-toolchain = {'name': 'goolf', 'version': '1.5.14'} 
+toolchain = {'name': 'goolf', 'version': '1.5.14'}
 toolchainopts = {'pic': True}
 
 sources = [SOURCELOWER_TAR_GZ]
diff --git a/easybuild/easyconfigs/n/netloc/netloc-0.5-GCC-4.8.3.eb b/easybuild/easyconfigs/n/netloc/netloc-0.5-GCC-4.8.3.eb
index 025be1d81d7..26ee8e7734c 100644
--- a/easybuild/easyconfigs/n/netloc/netloc-0.5-GCC-4.8.3.eb
+++ b/easybuild/easyconfigs/n/netloc/netloc-0.5-GCC-4.8.3.eb
@@ -10,7 +10,7 @@ description = """The Portable Network Locality (netloc) software package provide
  It is provided as a companion to the Portable Hardware Locality (hwloc) package."""
 
 toolchain = {'name': 'GCC', 'version': '4.8.3'}
-  
+
 source_urls = [homepage + '/v%(version_major_minor)s/downloads']
 sources = [SOURCE_TAR_GZ]
 
diff --git a/easybuild/easyconfigs/n/netloc/netloc-0.5-gcccuda-2.6.10.eb b/easybuild/easyconfigs/n/netloc/netloc-0.5-gcccuda-2.6.10.eb
index 6b5126f478b..71e8c661690 100644
--- a/easybuild/easyconfigs/n/netloc/netloc-0.5-gcccuda-2.6.10.eb
+++ b/easybuild/easyconfigs/n/netloc/netloc-0.5-gcccuda-2.6.10.eb
@@ -10,7 +10,7 @@ description = """The Portable Network Locality (netloc) software package provide
  It is provided as a companion to the Portable Hardware Locality (hwloc) package."""
 
 toolchain = {'name': 'gcccuda', 'version': '2.6.10'}
-  
+
 dependencies = [
     ('hwloc', '1.8'),
     ('Jansson', '2.5'),
diff --git a/easybuild/easyconfigs/n/numpy/numpy-1.6.2-ictce-4.0.6-Python-2.7.3.eb b/easybuild/easyconfigs/n/numpy/numpy-1.6.2-ictce-4.0.6-Python-2.7.3.eb
index 32146789ef5..cd51989f63b 100644
--- a/easybuild/easyconfigs/n/numpy/numpy-1.6.2-ictce-4.0.6-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/n/numpy/numpy-1.6.2-ictce-4.0.6-Python-2.7.3.eb
@@ -12,7 +12,7 @@ toolchain = {'name': 'ictce', 'version': '4.0.6'}
 
 source_urls = [SOURCEFORGE_SOURCE]
 sources = [SOURCE_TAR_GZ]
-                                      
+
 patches = ['numpy-1.6.2_distutils_multiple-lib-dirs.patch']
 
 python = 'Python'
diff --git a/easybuild/easyconfigs/n/numpy/numpy-1.6.2-ictce-4.1.13-Python-2.7.3.eb b/easybuild/easyconfigs/n/numpy/numpy-1.6.2-ictce-4.1.13-Python-2.7.3.eb
index 6f22931653f..0c0f8292031 100644
--- a/easybuild/easyconfigs/n/numpy/numpy-1.6.2-ictce-4.1.13-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/n/numpy/numpy-1.6.2-ictce-4.1.13-Python-2.7.3.eb
@@ -12,7 +12,7 @@ toolchain = {'name': 'ictce', 'version': '4.1.13'}
 
 source_urls = [('http://sourceforge.net/projects/numpy/files/NumPy/%(version)s', 'download')]
 sources = [SOURCE_TAR_GZ]
-                                      
+
 patches = ['numpy-%(version)s_distutils_multiple-lib-dirs.patch']
 
 python = 'Python'
diff --git a/easybuild/easyconfigs/n/numpy/numpy-1.6.2-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/n/numpy/numpy-1.6.2-ictce-5.3.0-Python-2.7.3.eb
index 0ea594ac42a..72587faf5d8 100644
--- a/easybuild/easyconfigs/n/numpy/numpy-1.6.2-ictce-5.3.0-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/n/numpy/numpy-1.6.2-ictce-5.3.0-Python-2.7.3.eb
@@ -12,7 +12,7 @@ toolchain = {'name': 'ictce', 'version': '5.3.0'}
 
 source_urls = [SOURCEFORGE_SOURCE]
 sources = [SOURCE_TAR_GZ]
-                                      
+
 patches = ['numpy-1.6.2_distutils_multiple-lib-dirs.patch']
 
 python = 'Python'
diff --git a/easybuild/easyconfigs/n/numpy/numpy-1.7.1-ictce-4.1.13-Python-2.7.5.eb b/easybuild/easyconfigs/n/numpy/numpy-1.7.1-ictce-4.1.13-Python-2.7.5.eb
index 722f3cab2c5..9211de2ef5e 100644
--- a/easybuild/easyconfigs/n/numpy/numpy-1.7.1-ictce-4.1.13-Python-2.7.5.eb
+++ b/easybuild/easyconfigs/n/numpy/numpy-1.7.1-ictce-4.1.13-Python-2.7.5.eb
@@ -14,7 +14,7 @@ source_urls = [SOURCEFORGE_SOURCE]
 sources = [SOURCE_TAR_GZ]
 
 patches = ['numpy-1.7.1_distutils_multiple-lib-dirs.patch']
-                                      
+
 python = 'Python'
 pyver = '2.7.5'
 versionsuffix = '-%s-%s' % (python, pyver)
diff --git a/easybuild/easyconfigs/o/Oger/Oger-1.1.3-goalf-1.1.0-no-OFED-Python-2.7.3.eb b/easybuild/easyconfigs/o/Oger/Oger-1.1.3-goalf-1.1.0-no-OFED-Python-2.7.3.eb
index 2e5794c12dc..15b1424e0dd 100644
--- a/easybuild/easyconfigs/o/Oger/Oger-1.1.3-goalf-1.1.0-no-OFED-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/o/Oger/Oger-1.1.3-goalf-1.1.0-no-OFED-Python-2.7.3.eb
@@ -28,9 +28,9 @@ options = {'modulename': name}
 
 sanity_check_paths = {
                         'files': ['lib/python2.7/site-packages/Oger/__init__.py'],
-                        'dirs': ['lib/python%s/site-packages/Oger/%s' % (pythonshortversion, dir) for dir in 
+                        'dirs': ['lib/python%s/site-packages/Oger/%s' % (pythonshortversion, dir) for dir in
                                     [
-                                        'datasets', 'evaluation', 'examples', 'gradient', 
+                                        'datasets', 'evaluation', 'examples', 'gradient',
                                         'nodes', 'parallel', 'tests', 'utils',
                                     ]
                             ]
diff --git a/easybuild/easyconfigs/o/Oger/Oger-1.1.3-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/o/Oger/Oger-1.1.3-goolf-1.4.10-Python-2.7.3.eb
index ca77bdf1b16..95e21e11e76 100644
--- a/easybuild/easyconfigs/o/Oger/Oger-1.1.3-goolf-1.4.10-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/o/Oger/Oger-1.1.3-goolf-1.4.10-Python-2.7.3.eb
@@ -29,9 +29,9 @@ options = {'modulename': name}
 
 sanity_check_paths = {
                         'files': ['lib/python2.7/site-packages/Oger/__init__.py'],
-                        'dirs': ['lib/python%s/site-packages/Oger/%s' % (pythonshortversion, dir) for dir in 
+                        'dirs': ['lib/python%s/site-packages/Oger/%s' % (pythonshortversion, dir) for dir in
                                     [
-                                        'datasets', 'evaluation', 'examples', 'gradient', 
+                                        'datasets', 'evaluation', 'examples', 'gradient',
                                         'nodes', 'parallel', 'tests', 'utils',
                                     ]
                             ]
diff --git a/easybuild/easyconfigs/o/Oger/Oger-1.1.3-ictce-4.0.6-Python-2.7.3.eb b/easybuild/easyconfigs/o/Oger/Oger-1.1.3-ictce-4.0.6-Python-2.7.3.eb
index 96fa8be9368..e5cd3a55039 100644
--- a/easybuild/easyconfigs/o/Oger/Oger-1.1.3-ictce-4.0.6-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/o/Oger/Oger-1.1.3-ictce-4.0.6-Python-2.7.3.eb
@@ -28,7 +28,7 @@ options = {'modulename': name}
 
 sanity_check_paths = {
                       'files': ['lib/python2.7/site-packages/Oger/__init__.py'],
-                      'dirs': ['lib/python%s/site-packages/Oger/%s' % (pythonshortversion, dir) for dir in 
+                      'dirs': ['lib/python%s/site-packages/Oger/%s' % (pythonshortversion, dir) for dir in
                                 ['datasets', 'evaluation', 'examples', 'gradient', 'nodes', 'parallel', 'tests', 'utils']
                               ]
                      }
diff --git a/easybuild/easyconfigs/o/Oger/Oger-1.1.3-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/o/Oger/Oger-1.1.3-ictce-5.3.0-Python-2.7.3.eb
index 3a511605840..a04089fb7da 100644
--- a/easybuild/easyconfigs/o/Oger/Oger-1.1.3-ictce-5.3.0-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/o/Oger/Oger-1.1.3-ictce-5.3.0-Python-2.7.3.eb
@@ -29,7 +29,7 @@ options = {'modulename': name}
 
 sanity_check_paths = {
                       'files': ['lib/python2.7/site-packages/Oger/__init__.py'],
-                      'dirs': ['lib/python%s/site-packages/Oger/%s' % (pythonshortversion, dir) for dir in 
+                      'dirs': ['lib/python%s/site-packages/Oger/%s' % (pythonshortversion, dir) for dir in
                                 ['datasets', 'evaluation', 'examples', 'gradient', 'nodes', 'parallel', 'tests', 'utils']
                               ]
                      }
diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.4-GCC-4.7.2-no-OFED.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.4-GCC-4.7.2-no-OFED.eb
index 8b588833b0c..4310e30ba03 100644
--- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.4-GCC-4.7.2-no-OFED.eb
+++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.4-GCC-4.7.2-no-OFED.eb
@@ -14,7 +14,7 @@ source_urls = ['http://www.open-mpi.org/software/ompi/v%(version_major_minor)s/d
 
 dependencies = [('hwloc', '1.6.2')]
 
-configopts = '--with-threads=posix --enable-shared --enable-mpi-thread-multiple --without-openib ' 
+configopts = '--with-threads=posix --enable-shared --enable-mpi-thread-multiple --without-openib '
 configopts += '--enable-mpirun-prefix-by-default '  # suppress failure modes in relation to mpirun path
 configopts += '--with-hwloc=$EBROOTHWLOC '  # hwloc support
 configopts += '--disable-dlopen '  # statically link component, don't do dynamic loading
diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.7.3-no-OFED.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.7.3-no-OFED.eb
index ccbc9394ec9..b1763322934 100644
--- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.7.3-no-OFED.eb
+++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.7.3-no-OFED.eb
@@ -12,7 +12,7 @@ toolchain = {'name': 'GCC', 'version': '4.7.3'}
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = ['http://www.open-mpi.org/software/ompi/v%(version_major_minor)s/downloads']
 
-patches = [ 
+patches = [
       'OpenMPI-1.6.5-vt_cupti_events.patch',
 ]
 
diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.1-no-OFED.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.1-no-OFED.eb
index ce23f553550..da09b2dec4c 100644
--- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.1-no-OFED.eb
+++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.1-no-OFED.eb
@@ -12,7 +12,7 @@ toolchain = {'name': 'GCC', 'version': '4.8.1'}
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = ['http://www.open-mpi.org/software/ompi/v%(version_major_minor)s/downloads']
 
-patches = [ 
+patches = [
       'OpenMPI-1.6.5-vt_cupti_events.patch',
 ]
 
diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.1.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.1.eb
index c6b40582c81..192e2876579 100644
--- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.1.eb
+++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.1.eb
@@ -11,7 +11,7 @@ toolchain = {'name': 'GCC', 'version': '4.8.1'}
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = ['http://www.open-mpi.org/software/ompi/v%(version_major_minor)s/downloads']
 
-patches = [ 
+patches = [
       'OpenMPI-1.6.5-vt_cupti_events.patch',
 ]
 
diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.2-no-OFED.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.2-no-OFED.eb
index 2afbc4733e2..6714cfb974e 100644
--- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.2-no-OFED.eb
+++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.2-no-OFED.eb
@@ -12,7 +12,7 @@ toolchain = {'name': 'GCC', 'version': '4.8.2'}
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = ['http://www.open-mpi.org/software/ompi/v%(version_major_minor)s/downloads']
 
-patches = [ 
+patches = [
       'OpenMPI-1.6.5-vt_cupti_events.patch',
 ]
 
diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.2.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.2.eb
index 8af372736a4..dcc884ec547 100644
--- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.2.eb
+++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.2.eb
@@ -11,7 +11,7 @@ toolchain = {'name': 'GCC', 'version': '4.8.2'}
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = ['http://www.open-mpi.org/software/ompi/v%(version_major_minor)s/downloads']
 
-patches = [ 
+patches = [
       'OpenMPI-1.6.5-vt_cupti_events.patch',
 ]
 
diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.3.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.3.eb
index 2ae7377c371..ef8df74e302 100644
--- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.3.eb
+++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-GCC-4.8.3.eb
@@ -11,7 +11,7 @@ toolchain = {'name': 'GCC', 'version': '4.8.3'}
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = ['http://www.open-mpi.org/software/ompi/v%(version_major_minor)s/downloads']
 
-patches = [ 
+patches = [
       'OpenMPI-1.6.5-vt_cupti_events.patch',
 ]
 
diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.7.3-gcccuda-2.6.10.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.7.3-gcccuda-2.6.10.eb
index 10774dff41a..0d0d8c22439 100644
--- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.7.3-gcccuda-2.6.10.eb
+++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.7.3-gcccuda-2.6.10.eb
@@ -11,7 +11,7 @@ toolchain = {'name': 'gcccuda', 'version': '2.6.10'}
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = ['http://www.open-mpi.org/software/ompi/v%(version_major_minor)s/downloads']
 
-patches = [ 
+patches = [
     'OpenMPI-%(version)s_common-cuda-lib.patch',
     'OpenMPI-%(version)s-vt_cupti_events.patch',
 ]
diff --git a/easybuild/easyconfigs/o/o2scl/o2scl-0.913-goolf-1.4.10.eb b/easybuild/easyconfigs/o/o2scl/o2scl-0.913-goolf-1.4.10.eb
index 539e278a557..665ae52c04d 100644
--- a/easybuild/easyconfigs/o/o2scl/o2scl-0.913-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/o/o2scl/o2scl-0.913-goolf-1.4.10.eb
@@ -20,7 +20,7 @@ toolchain = {'name': 'goolf', 'version': '1.4.10'}
 source_urls = [SOURCEFORGE_SOURCE]
 sources = [SOURCELOWER_TAR_GZ]
 
-dependencies = [ 
+dependencies = [
     ('Eigen', '3.1.4'),
     ('libreadline', '6.2'),
     ('HDF5', '1.8.11'),
diff --git a/easybuild/easyconfigs/o/orthomcl/orthomcl-2.0.8-goolf-1.4.10-Perl-5.16.3.eb b/easybuild/easyconfigs/o/orthomcl/orthomcl-2.0.8-goolf-1.4.10-Perl-5.16.3.eb
index 54437d6a78a..2cbfe2886fe 100644
--- a/easybuild/easyconfigs/o/orthomcl/orthomcl-2.0.8-goolf-1.4.10-Perl-5.16.3.eb
+++ b/easybuild/easyconfigs/o/orthomcl/orthomcl-2.0.8-goolf-1.4.10-Perl-5.16.3.eb
@@ -27,7 +27,7 @@ sanity_check_paths = {
                                                  'ExtractProteinIdsFromGroupsFile', 'ExtractProteinPairsFromGroupsFile',
                                                  'FilterFasta', 'InstallSchema', 'LoadBlast', 'MclToGroups', 'Pairs',
                                                  'ReduceFasta', 'ReduceGroups', 'RemoveIdenticalGroups', 'Singletons',
-                                                 'SortGroupMembersByScore', 'SortGroupsFile']], 
+                                                 'SortGroupMembersByScore', 'SortGroupsFile']],
     'dirs': ['lib/perl/OrthoMCLEngine'],
 }
 
diff --git a/easybuild/easyconfigs/o/orthomcl/orthomcl-2.0.8-ictce-4.1.13-Perl-5.16.3.eb b/easybuild/easyconfigs/o/orthomcl/orthomcl-2.0.8-ictce-4.1.13-Perl-5.16.3.eb
index 0bcdb50b2fc..b5689400cf4 100644
--- a/easybuild/easyconfigs/o/orthomcl/orthomcl-2.0.8-ictce-4.1.13-Perl-5.16.3.eb
+++ b/easybuild/easyconfigs/o/orthomcl/orthomcl-2.0.8-ictce-4.1.13-Perl-5.16.3.eb
@@ -27,7 +27,7 @@ sanity_check_paths = {
                                                  'ExtractProteinIdsFromGroupsFile', 'ExtractProteinPairsFromGroupsFile',
                                                  'FilterFasta', 'InstallSchema', 'LoadBlast', 'MclToGroups', 'Pairs',
                                                  'ReduceFasta', 'ReduceGroups', 'RemoveIdenticalGroups', 'Singletons',
-                                                 'SortGroupMembersByScore', 'SortGroupsFile']], 
+                                                 'SortGroupMembersByScore', 'SortGroupsFile']],
     'dirs': ['lib/perl/OrthoMCLEngine'],
 }
 
diff --git a/easybuild/easyconfigs/o/orthomcl/orthomcl-2.0.8-ictce-5.3.0-Perl-5.16.3.eb b/easybuild/easyconfigs/o/orthomcl/orthomcl-2.0.8-ictce-5.3.0-Perl-5.16.3.eb
index 4cb9385e591..2fe03116064 100644
--- a/easybuild/easyconfigs/o/orthomcl/orthomcl-2.0.8-ictce-5.3.0-Perl-5.16.3.eb
+++ b/easybuild/easyconfigs/o/orthomcl/orthomcl-2.0.8-ictce-5.3.0-Perl-5.16.3.eb
@@ -27,7 +27,7 @@ sanity_check_paths = {
                                                  'ExtractProteinIdsFromGroupsFile', 'ExtractProteinPairsFromGroupsFile',
                                                  'FilterFasta', 'InstallSchema', 'LoadBlast', 'MclToGroups', 'Pairs',
                                                  'ReduceFasta', 'ReduceGroups', 'RemoveIdenticalGroups', 'Singletons',
-                                                 'SortGroupMembersByScore', 'SortGroupsFile']], 
+                                                 'SortGroupMembersByScore', 'SortGroupsFile']],
     'dirs': ['lib/perl/OrthoMCLEngine'],
 }
 
diff --git a/easybuild/easyconfigs/p/PBZIP2/PBZIP2-1.1.8-goolf-1.4.10.eb b/easybuild/easyconfigs/p/PBZIP2/PBZIP2-1.1.8-goolf-1.4.10.eb
index e0822f5ef30..e1ffffe6152 100644
--- a/easybuild/easyconfigs/p/PBZIP2/PBZIP2-1.1.8-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/p/PBZIP2/PBZIP2-1.1.8-goolf-1.4.10.eb
@@ -6,7 +6,7 @@
 easyblock = 'MakeCp'
 
 name = 'PBZIP2'
-version = '1.1.8' 
+version = '1.1.8'
 
 homepage = 'http://compression.ca/pbzip2/'
 description = """ PBZIP2 is a parallel implementation of the bzip2 block-sorting file 
@@ -24,7 +24,7 @@ buildopts = " CC=$CXX"
 parallel = 1
 
 files_to_copy = [(["pbzip2"], "bin"), (["pbzip2.1"], "man/man1"), "README", "ChangeLog"]
-        
+
 sanity_check_paths = {
     'files': ["bin/pbzip2"],
     'dirs': [],
diff --git a/easybuild/easyconfigs/p/PBZIP2/PBZIP2-1.1.8-ictce-6.2.5.eb b/easybuild/easyconfigs/p/PBZIP2/PBZIP2-1.1.8-ictce-6.2.5.eb
index a1befffbe40..795cc4f409c 100644
--- a/easybuild/easyconfigs/p/PBZIP2/PBZIP2-1.1.8-ictce-6.2.5.eb
+++ b/easybuild/easyconfigs/p/PBZIP2/PBZIP2-1.1.8-ictce-6.2.5.eb
@@ -6,7 +6,7 @@
 easyblock = 'MakeCp'
 
 name = 'PBZIP2'
-version = '1.1.8' 
+version = '1.1.8'
 
 homepage = 'http://compression.ca/pbzip2/'
 description = """ PBZIP2 is a parallel implementation of the bzip2 block-sorting file 
@@ -14,7 +14,7 @@ description = """ PBZIP2 is a parallel implementation of the bzip2 block-sorting
  of this version is fully compatible with bzip2 v1.0.2 or newer (ie: anything compressed 
  with pbzip2 can be decompressed with bzip2)."""
 
-toolchain = {'name': 'ictce', 'version': '6.2.5'} 
+toolchain = {'name': 'ictce', 'version': '6.2.5'}
 
 source_urls = ['http://compression.ca/pbzip2/']
 sources = [SOURCELOWER_TAR_GZ]
@@ -24,7 +24,7 @@ buildopts = " CC=$CXX"
 parallel = 1
 
 files_to_copy = [(["pbzip2"], "bin"), (["pbzip2.1"], "man/man1"), "README", "ChangeLog"]
-        
+
 sanity_check_paths = {
     'files': ["bin/pbzip2"],
     'dirs': [],
diff --git a/easybuild/easyconfigs/p/PCC/PCC-20131024.eb b/easybuild/easyconfigs/p/PCC/PCC-20131024.eb
index be6e59a2e93..c40392b7711 100644
--- a/easybuild/easyconfigs/p/PCC/PCC-20131024.eb
+++ b/easybuild/easyconfigs/p/PCC/PCC-20131024.eb
@@ -28,7 +28,7 @@ builddependencies = [
 ]
 
 sanity_check_paths = {
-    'files': ["bin/pcc"], 
+    'files': ["bin/pcc"],
     'dirs': ["lib"]
 }
 
diff --git a/easybuild/easyconfigs/p/PETSc/PETSc-3.5.1-intel-2014b-Python-2.7.8.eb b/easybuild/easyconfigs/p/PETSc/PETSc-3.5.1-intel-2014b-Python-2.7.8.eb
index 4cff265549c..72b0ef23a93 100644
--- a/easybuild/easyconfigs/p/PETSc/PETSc-3.5.1-intel-2014b-Python-2.7.8.eb
+++ b/easybuild/easyconfigs/p/PETSc/PETSc-3.5.1-intel-2014b-Python-2.7.8.eb
@@ -15,7 +15,7 @@ sources = [SOURCELOWER_TAR_GZ]
 patches = [
     'PETSc_ranlib-fix.patch',
     'PETSc-%(version)s-zlibfix.patch',
-] 
+]
 
 parmetis = 'ParMETIS'
 parmetis_ver = '4.0.3'
diff --git a/easybuild/easyconfigs/p/PLINK/PLINK-1.07-x86_64.eb b/easybuild/easyconfigs/p/PLINK/PLINK-1.07-x86_64.eb
index 50bb76fbb33..7f7c8b29a21 100644
--- a/easybuild/easyconfigs/p/PLINK/PLINK-1.07-x86_64.eb
+++ b/easybuild/easyconfigs/p/PLINK/PLINK-1.07-x86_64.eb
@@ -14,7 +14,7 @@ source_urls = ['http://pngu.mgh.harvard.edu/~purcell/plink/dist/']
 checksums = ['fd0bafeda42151b20534e4f97b0d97df']
 
 files_to_copy = [
-    'plink', 
+    'plink',
     'gPLINK.jar',
     'test.map',
     'test.ped',
diff --git a/easybuild/easyconfigs/p/PROJ/PROJ-4.8.0-goolf-1.4.10.eb b/easybuild/easyconfigs/p/PROJ/PROJ-4.8.0-goolf-1.4.10.eb
index 2060e3874c7..34a1760e0e9 100644
--- a/easybuild/easyconfigs/p/PROJ/PROJ-4.8.0-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/p/PROJ/PROJ-4.8.0-goolf-1.4.10.eb
@@ -22,7 +22,7 @@ source_urls = ['http://download.osgeo.org/proj/']
 sources = [SOURCELOWER_TAR_GZ]
 
 sanity_check_paths = {
-    'files': ['bin/cs2cs', 'bin/geod', 'bin/invgeod', 'bin/invproj', 
+    'files': ['bin/cs2cs', 'bin/geod', 'bin/invgeod', 'bin/invproj',
               'bin/nad2bin', 'bin/proj'],
     'dirs': [],
 }
diff --git a/easybuild/easyconfigs/p/PROJ/PROJ-4.8.0-ictce-5.3.0.eb b/easybuild/easyconfigs/p/PROJ/PROJ-4.8.0-ictce-5.3.0.eb
index 427477bf963..1a6432b2aa6 100644
--- a/easybuild/easyconfigs/p/PROJ/PROJ-4.8.0-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/p/PROJ/PROJ-4.8.0-ictce-5.3.0.eb
@@ -22,7 +22,7 @@ source_urls = ['http://download.osgeo.org/proj/']
 sources = [SOURCELOWER_TAR_GZ]
 
 sanity_check_paths = {
-    'files': ['bin/cs2cs', 'bin/geod', 'bin/invgeod', 'bin/invproj', 
+    'files': ['bin/cs2cs', 'bin/geod', 'bin/invgeod', 'bin/invproj',
               'bin/nad2bin', 'bin/proj'],
     'dirs': [],
 }
diff --git a/easybuild/easyconfigs/p/PaStiX/PaStiX-5.2.2.22-intel-2015b.eb b/easybuild/easyconfigs/p/PaStiX/PaStiX-5.2.2.22-intel-2015b.eb
index 82b29f84c1a..34d2da9e2f5 100644
--- a/easybuild/easyconfigs/p/PaStiX/PaStiX-5.2.2.22-intel-2015b.eb
+++ b/easybuild/easyconfigs/p/PaStiX/PaStiX-5.2.2.22-intel-2015b.eb
@@ -32,7 +32,7 @@ buildopts += 'MPCXXPROG="$MPICXX -cxx=$CXX -Wall" '
 
 runtest = "examples && ./example/bin/simple -lap 100"
 
-installopts = "PREFIX=%(installdir)s" 
+installopts = "PREFIX=%(installdir)s"
 
 sanity_check_paths = {
     'files': ['bin/pastix-conf', 'lib/libmatrix_driver.a', 'lib/libpastix.a', 'lib/libpastix_murge.a'],
diff --git a/easybuild/easyconfigs/p/Pangomm/Pangomm-2.36.0-intel-2015a.eb b/easybuild/easyconfigs/p/Pangomm/Pangomm-2.36.0-intel-2015a.eb
index 3ad20e9bd11..d0dd1f99071 100644
--- a/easybuild/easyconfigs/p/Pangomm/Pangomm-2.36.0-intel-2015a.eb
+++ b/easybuild/easyconfigs/p/Pangomm/Pangomm-2.36.0-intel-2015a.eb
@@ -21,6 +21,6 @@ dependencies = [
 sanity_check_paths = {
     'files': ['lib/libpangomm-1.4.%s' % SHLIB_EXT],
     'dirs': [],
-} 
+}
 
 moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/p/Pangomm/Pangomm-2.36.0-intel-2015b.eb b/easybuild/easyconfigs/p/Pangomm/Pangomm-2.36.0-intel-2015b.eb
index 1c45a9716d0..71f5cdfd45f 100644
--- a/easybuild/easyconfigs/p/Pangomm/Pangomm-2.36.0-intel-2015b.eb
+++ b/easybuild/easyconfigs/p/Pangomm/Pangomm-2.36.0-intel-2015b.eb
@@ -21,6 +21,6 @@ dependencies = [
 sanity_check_paths = {
     'files': ['lib/libpangomm-1.4.%s' % SHLIB_EXT],
     'dirs': [],
-} 
+}
 
 moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/p/ParaView/ParaView-4.3.1-intel-2015a-Python-2.7.10-mpi.eb b/easybuild/easyconfigs/p/ParaView/ParaView-4.3.1-intel-2015a-Python-2.7.10-mpi.eb
index 003394e4e20..96e7b3b1b8e 100644
--- a/easybuild/easyconfigs/p/ParaView/ParaView-4.3.1-intel-2015a-Python-2.7.10-mpi.eb
+++ b/easybuild/easyconfigs/p/ParaView/ParaView-4.3.1-intel-2015a-Python-2.7.10-mpi.eb
@@ -33,7 +33,7 @@ builddependencies = [('CMake', '3.2.2')]
 
 separate_build_dir = True
 
-maxparallel = 4 
+maxparallel = 4
 
 configopts = '-DPARAVIEW_INSTALL_DEVELOPMENT_FILES=ON -DVTK_OPENGL_HAS_OSMESA=ON -DPARAVIEW_USE_MPI=ON '
 configopts += '-DOPENGL_INCLUDE_DIR=$EBROOTMESA/include -DOPENGL_gl_LIBRARY=$EBROOTMESA/lib/libGL.so '
diff --git a/easybuild/easyconfigs/p/ParaView/ParaView-4.3.1-intel-2015a-Python-2.7.10.eb b/easybuild/easyconfigs/p/ParaView/ParaView-4.3.1-intel-2015a-Python-2.7.10.eb
index db991517385..a80a2bae484 100644
--- a/easybuild/easyconfigs/p/ParaView/ParaView-4.3.1-intel-2015a-Python-2.7.10.eb
+++ b/easybuild/easyconfigs/p/ParaView/ParaView-4.3.1-intel-2015a-Python-2.7.10.eb
@@ -32,7 +32,7 @@ builddependencies = [('CMake', '3.2.2')]
 
 separate_build_dir = True
 
-maxparallel = 4 
+maxparallel = 4
 
 configopts = '-DPARAVIEW_INSTALL_DEVELOPMENT_FILES=ON -DVTK_OPENGL_HAS_OSMESA=ON '
 configopts += '-DOPENGL_INCLUDE_DIR=$EBROOTMESA/include -DOPENGL_gl_LIBRARY=$EBROOTMESA/lib/libGL.so '
diff --git a/easybuild/easyconfigs/p/ParaView/ParaView-4.4.0-intel-2015b-mpi.eb b/easybuild/easyconfigs/p/ParaView/ParaView-4.4.0-intel-2015b-mpi.eb
index fb6b899d907..9449cd74f2b 100644
--- a/easybuild/easyconfigs/p/ParaView/ParaView-4.4.0-intel-2015b-mpi.eb
+++ b/easybuild/easyconfigs/p/ParaView/ParaView-4.4.0-intel-2015b-mpi.eb
@@ -33,7 +33,7 @@ builddependencies = [('CMake', '3.3.2')]
 
 separate_build_dir = True
 
-maxparallel = 4 
+maxparallel = 4
 
 configopts = '-DPARAVIEW_INSTALL_DEVELOPMENT_FILES=ON -DVTK_OPENGL_HAS_OSMESA=ON -DPARAVIEW_USE_MPI=ON '
 configopts += '-DOPENGL_INCLUDE_DIR=$EBROOTMESA/include -DOPENGL_gl_LIBRARY=$EBROOTMESA/lib/libGL.so '
diff --git a/easybuild/easyconfigs/p/ParaView/ParaView-4.4.0-intel-2015b.eb b/easybuild/easyconfigs/p/ParaView/ParaView-4.4.0-intel-2015b.eb
index 00106458b88..cb5acbbae9f 100644
--- a/easybuild/easyconfigs/p/ParaView/ParaView-4.4.0-intel-2015b.eb
+++ b/easybuild/easyconfigs/p/ParaView/ParaView-4.4.0-intel-2015b.eb
@@ -32,7 +32,7 @@ builddependencies = [('CMake', '3.3.2')]
 
 separate_build_dir = True
 
-maxparallel = 4 
+maxparallel = 4
 
 configopts = '-DPARAVIEW_INSTALL_DEVELOPMENT_FILES=ON -DVTK_OPENGL_HAS_OSMESA=ON '
 configopts += '-DOPENGL_INCLUDE_DIR=$EBROOTMESA/include -DOPENGL_gl_LIBRARY=$EBROOTMESA/lib/libGL.so '
diff --git a/easybuild/easyconfigs/p/Pillow/Pillow-2.8.1-foss-2015a-Python-2.7.9.eb b/easybuild/easyconfigs/p/Pillow/Pillow-2.8.1-foss-2015a-Python-2.7.9.eb
index 524dd9ba3d6..aededa4507c 100644
--- a/easybuild/easyconfigs/p/Pillow/Pillow-2.8.1-foss-2015a-Python-2.7.9.eb
+++ b/easybuild/easyconfigs/p/Pillow/Pillow-2.8.1-foss-2015a-Python-2.7.9.eb
@@ -7,7 +7,7 @@ homepage = 'http://pillow.readthedocs.org/'
 description = """Pillow is the 'friendly PIL fork' by Alex Clark and Contributors.
  PIL is the Python Imaging Library by Fredrik Lundh and Contributors."""
 
-toolchain = {'name': 'foss', 'version': '2015a'} 
+toolchain = {'name': 'foss', 'version': '2015a'}
 
 source_urls = [PYPI_SOURCE]
 sources = [SOURCE_TAR_GZ]
diff --git a/easybuild/easyconfigs/p/Pillow/Pillow-2.8.1-intel-2015a-Python-2.7.9.eb b/easybuild/easyconfigs/p/Pillow/Pillow-2.8.1-intel-2015a-Python-2.7.9.eb
index 04c7f0efa3c..07b42e823be 100644
--- a/easybuild/easyconfigs/p/Pillow/Pillow-2.8.1-intel-2015a-Python-2.7.9.eb
+++ b/easybuild/easyconfigs/p/Pillow/Pillow-2.8.1-intel-2015a-Python-2.7.9.eb
@@ -7,7 +7,7 @@ homepage = 'http://pillow.readthedocs.org/'
 description = """Pillow is the 'friendly PIL fork' by Alex Clark and Contributors.
  PIL is the Python Imaging Library by Fredrik Lundh and Contributors."""
 
-toolchain = {'name': 'intel', 'version': '2015a'} 
+toolchain = {'name': 'intel', 'version': '2015a'}
 
 source_urls = [PYPI_SOURCE]
 sources = [SOURCE_TAR_GZ]
diff --git a/easybuild/easyconfigs/p/Pindel/Pindel-0.2.5a7-goolf-1.4.10.eb b/easybuild/easyconfigs/p/Pindel/Pindel-0.2.5a7-goolf-1.4.10.eb
index 65d0c45c59d..864b80e95ce 100644
--- a/easybuild/easyconfigs/p/Pindel/Pindel-0.2.5a7-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/p/Pindel/Pindel-0.2.5a7-goolf-1.4.10.eb
@@ -28,14 +28,14 @@ dependencies = [
 ]
 
 cmds_map = [('.*', "CPATH=$EBROOTSAMTOOLS/include/bam:$CPATH ./INSTALL $EBROOTSAMTOOLS")]
- 
+
 files_to_copy = [
     (['pindel', 'sam2pindel', 'pindel2vcf', 'bam2pindel.pl', 'Adaptor.pm'], 'bin'),
-     "demo", 
-     "gmt", 
-     "gmt-web", 
-     "test", 
-     "README.md", 
+     "demo",
+     "gmt",
+     "gmt-web",
+     "test",
+     "README.md",
      "RELEASE"
 ]
 
diff --git a/easybuild/easyconfigs/p/pBWA/pBWA-0.5.9_1.21009-goolf-1.4.10.eb b/easybuild/easyconfigs/p/pBWA/pBWA-0.5.9_1.21009-goolf-1.4.10.eb
index fa5b729bcb6..8678c701924 100644
--- a/easybuild/easyconfigs/p/pBWA/pBWA-0.5.9_1.21009-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/p/pBWA/pBWA-0.5.9_1.21009-goolf-1.4.10.eb
@@ -28,6 +28,6 @@ files_to_copy = [(['pBWA','qualfa2fq.pl','solid2fastq.pl' ], 'bin')]
 sanity_check_paths = {
     'files': ['bin/pBWA','bin/qualfa2fq.pl','bin/solid2fastq.pl'],
     'dirs': ['.'],
-} 
+}
 
 moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/p/pigz/pigz-2.3.1-goolf-1.4.10.eb b/easybuild/easyconfigs/p/pigz/pigz-2.3.1-goolf-1.4.10.eb
index 2c50b49d227..292fb226d32 100644
--- a/easybuild/easyconfigs/p/pigz/pigz-2.3.1-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/p/pigz/pigz-2.3.1-goolf-1.4.10.eb
@@ -6,7 +6,7 @@
 easyblock = 'MakeCp'
 
 name = 'pigz'
-version = '2.3.1' 
+version = '2.3.1'
 
 homepage = 'http://zlib.net/pigz/'
 description = """ pigz, which stands for parallel implementation of gzip, is a fully 
@@ -27,7 +27,7 @@ buildopts = ' CC=$CC'
 parallel = 1
 
 files_to_copy = [(["pigz", "unpigz"], "bin")]
-        
+
 sanity_check_paths = {
     'files': ["bin/pigz", "bin/unpigz"],
     'dirs': [""],
diff --git a/easybuild/easyconfigs/p/pigz/pigz-2.3.1-ictce-6.2.5.eb b/easybuild/easyconfigs/p/pigz/pigz-2.3.1-ictce-6.2.5.eb
index ec92fe5f04e..770c70dd5f7 100644
--- a/easybuild/easyconfigs/p/pigz/pigz-2.3.1-ictce-6.2.5.eb
+++ b/easybuild/easyconfigs/p/pigz/pigz-2.3.1-ictce-6.2.5.eb
@@ -6,7 +6,7 @@
 easyblock = 'MakeCp'
 
 name = 'pigz'
-version = '2.3.1' 
+version = '2.3.1'
 
 homepage = 'http://zlib.net/pigz/'
 description = """ pigz, which stands for parallel implementation of gzip, is a fully 
@@ -27,7 +27,7 @@ buildopts = ' CC=$CC'
 parallel = 1
 
 files_to_copy = [(["pigz", "unpigz"], "bin")]
-        
+
 sanity_check_paths = {
     'files': ["bin/pigz", "bin/unpigz"],
     'dirs': [""],
diff --git a/easybuild/easyconfigs/p/pigz/pigz-2.3.3-foss-2015b.eb b/easybuild/easyconfigs/p/pigz/pigz-2.3.3-foss-2015b.eb
index a4a1fb5b25a..e95cb85cb9f 100644
--- a/easybuild/easyconfigs/p/pigz/pigz-2.3.3-foss-2015b.eb
+++ b/easybuild/easyconfigs/p/pigz/pigz-2.3.3-foss-2015b.eb
@@ -30,7 +30,7 @@ buildopts = ' CC=$CC'
 parallel = 1
 
 files_to_copy = [(["pigz", "unpigz"], "bin")]
-        
+
 sanity_check_paths = {
     'files': ["bin/pigz", "bin/unpigz"],
     'dirs': [""],
diff --git a/easybuild/easyconfigs/p/popt/popt-1.14-iccifort-2015.1.133.eb b/easybuild/easyconfigs/p/popt/popt-1.14-iccifort-2015.1.133.eb
index da01178a4cc..24a941cf28c 100644
--- a/easybuild/easyconfigs/p/popt/popt-1.14-iccifort-2015.1.133.eb
+++ b/easybuild/easyconfigs/p/popt/popt-1.14-iccifort-2015.1.133.eb
@@ -5,7 +5,7 @@ version = '1.14'
 
 homepage = "http://freecode.com/projects/popt"
 description = """Popt is a C library for parsing command line parameters."""
-toolchain = {'name': 'iccifort', 'version': '2015.1.133'} 
+toolchain = {'name': 'iccifort', 'version': '2015.1.133'}
 
 
 source_urls = ['http://rpm5.org/files/popt/']
diff --git a/easybuild/easyconfigs/p/popt/popt-1.16-GCC-4.9.2.eb b/easybuild/easyconfigs/p/popt/popt-1.16-GCC-4.9.2.eb
index 544e28528a8..07519cbd9a9 100644
--- a/easybuild/easyconfigs/p/popt/popt-1.16-GCC-4.9.2.eb
+++ b/easybuild/easyconfigs/p/popt/popt-1.16-GCC-4.9.2.eb
@@ -1,7 +1,7 @@
 easyblock = 'ConfigureMake'
 
 name = 'popt'
-version = "1.16" 
+version = "1.16"
 
 homepage = "http://freecode.com/projects/popt"
 description = """Popt is a C library for parsing command line parameters."""
diff --git a/easybuild/easyconfigs/p/pscom/pscom-5.0.44-1-iccifort-2015.1.133.eb b/easybuild/easyconfigs/p/pscom/pscom-5.0.44-1-iccifort-2015.1.133.eb
index 66ec7c7853c..3b463debfce 100644
--- a/easybuild/easyconfigs/p/pscom/pscom-5.0.44-1-iccifort-2015.1.133.eb
+++ b/easybuild/easyconfigs/p/pscom/pscom-5.0.44-1-iccifort-2015.1.133.eb
@@ -4,7 +4,7 @@ name = 'pscom'
 version = '5.0.44-1'
 homepage = 'http://www.par-tec.com'
 description = """ParaStation is a robust and efficient cluster middleware, consisting of a high-performance communication layer (MPI) and a sophisticated management layer."""
-toolchain = {'name': 'iccifort', 'version': '2015.1.133'} 
+toolchain = {'name': 'iccifort', 'version': '2015.1.133'}
 
 
 source_urls = ['https://github.com/ParaStation/%(name)s/archive/']
diff --git a/easybuild/easyconfigs/p/psmpi2/psmpi2-5.0.29-GCC-4.8.2-mt.eb b/easybuild/easyconfigs/p/psmpi2/psmpi2-5.0.29-GCC-4.8.2-mt.eb
index 8690e4b98bd..d7fb1e75ef2 100644
--- a/easybuild/easyconfigs/p/psmpi2/psmpi2-5.0.29-GCC-4.8.2-mt.eb
+++ b/easybuild/easyconfigs/p/psmpi2/psmpi2-5.0.29-GCC-4.8.2-mt.eb
@@ -33,8 +33,8 @@ prebuildopts = "echo '%(version)s-1' > VERSION && "
 preinstallopts = prebuildopts
 
 sanity_check_paths = {
-    'files': ['bin/mpicc', 'bin/mpicxx', 'bin/mpic++', 'bin/mpif77', 'bin/mpif90', 
-              'include/mpi.h', 'include/mpi.mod', 'include/mpif.h', 
+    'files': ['bin/mpicc', 'bin/mpicxx', 'bin/mpic++', 'bin/mpif77', 'bin/mpif90',
+              'include/mpi.h', 'include/mpi.mod', 'include/mpif.h',
               ('lib/libfmpich.a',    'lib64/libfmpich.a'),
               ('lib/libfmpich.%s' % SHLIB_EXT,   'lib64/libfmpich.%s' % SHLIB_EXT),
               ('lib/libmpich.a',     'lib64/libmpich.a'),
diff --git a/easybuild/easyconfigs/p/psmpi2/psmpi2-5.0.29-GCC-4.8.2.eb b/easybuild/easyconfigs/p/psmpi2/psmpi2-5.0.29-GCC-4.8.2.eb
index 101fec10943..9c3dd66c773 100644
--- a/easybuild/easyconfigs/p/psmpi2/psmpi2-5.0.29-GCC-4.8.2.eb
+++ b/easybuild/easyconfigs/p/psmpi2/psmpi2-5.0.29-GCC-4.8.2.eb
@@ -32,8 +32,8 @@ prebuildopts = "echo '%(version)s-1' > VERSION && "
 preinstallopts = prebuildopts
 
 sanity_check_paths = {
-    'files': ['bin/mpicc', 'bin/mpicxx', 'bin/mpic++', 'bin/mpif77', 'bin/mpif90', 
-              'include/mpi.h', 'include/mpi.mod', 'include/mpif.h', 
+    'files': ['bin/mpicc', 'bin/mpicxx', 'bin/mpic++', 'bin/mpif77', 'bin/mpif90',
+              'include/mpi.h', 'include/mpi.mod', 'include/mpif.h',
               ('lib/libfmpich.a',    'lib64/libfmpich.a'),
               ('lib/libfmpich.%s' % SHLIB_EXT,   'lib64/libfmpich.%s' % SHLIB_EXT),
               ('lib/libmpich.a',     'lib64/libmpich.a'),
diff --git a/easybuild/easyconfigs/q/Qt/Qt-4.8.5-gmpolf-1.4.8.eb b/easybuild/easyconfigs/q/Qt/Qt-4.8.5-gmpolf-1.4.8.eb
index 785cdca42b5..5406e997c61 100644
--- a/easybuild/easyconfigs/q/Qt/Qt-4.8.5-gmpolf-1.4.8.eb
+++ b/easybuild/easyconfigs/q/Qt/Qt-4.8.5-gmpolf-1.4.8.eb
@@ -4,7 +4,7 @@ version = '4.8.5'
 homepage = 'http://qt.io/'
 description = "Qt is a comprehensive cross-platform C++ application framework."
 
-toolchain = {'name': 'gmpolf', 'version': '1.4.8'} 
+toolchain = {'name': 'gmpolf', 'version': '1.4.8'}
 
 source_urls = [
     'http://download.qt.io/official_releases/qt/%(version_major_minor)s/%(version)s/',
diff --git a/easybuild/easyconfigs/q/Qt/Qt-4.8.5-goolf-1.5.14.eb b/easybuild/easyconfigs/q/Qt/Qt-4.8.5-goolf-1.5.14.eb
index eb4b11b03a4..c5c6c8344b4 100644
--- a/easybuild/easyconfigs/q/Qt/Qt-4.8.5-goolf-1.5.14.eb
+++ b/easybuild/easyconfigs/q/Qt/Qt-4.8.5-goolf-1.5.14.eb
@@ -4,7 +4,7 @@ version = '4.8.5'
 homepage = 'http://qt.io/'
 description = "Qt is a comprehensive cross-platform C++ application framework."
 
-toolchain = {'name': 'goolf', 'version': '1.5.14'} 
+toolchain = {'name': 'goolf', 'version': '1.5.14'}
 
 source_urls = [
     'http://download.qt.io/official_releases/qt/%(version_major_minor)s/%(version)s/',
diff --git a/easybuild/easyconfigs/q/Quip/Quip-1.1.8-GCC-4.8.2.eb b/easybuild/easyconfigs/q/Quip/Quip-1.1.8-GCC-4.8.2.eb
index 1cda3a4011f..e4973548b5d 100644
--- a/easybuild/easyconfigs/q/Quip/Quip-1.1.8-GCC-4.8.2.eb
+++ b/easybuild/easyconfigs/q/Quip/Quip-1.1.8-GCC-4.8.2.eb
@@ -23,7 +23,7 @@ sources = [SOURCELOWER_TAR_GZ]
 source_urls = [homepage]
 
 sanity_check_paths = {
-    'files': ["bin/quip"], 
+    'files': ["bin/quip"],
     'dirs': []
 }
 
diff --git a/easybuild/easyconfigs/q/qtop/qtop-53-1.eb b/easybuild/easyconfigs/q/qtop/qtop-53-1.eb
index c04c0cb73de..1e12105e71b 100644
--- a/easybuild/easyconfigs/q/qtop/qtop-53-1.eb
+++ b/easybuild/easyconfigs/q/qtop/qtop-53-1.eb
@@ -27,7 +27,7 @@ sources = [SOURCE_TAR_GZ]
 source_urls = [homepage]
 
 sanity_check_paths = {
-    'files': ["qtop"], 
+    'files': ["qtop"],
     'dirs': []
 }
 
diff --git a/easybuild/easyconfigs/r/RSEQtools/RSEQtools-0.6-goolf-1.4.10.eb b/easybuild/easyconfigs/r/RSEQtools/RSEQtools-0.6-goolf-1.4.10.eb
index 418cc4118e7..d832fcca936 100644
--- a/easybuild/easyconfigs/r/RSEQtools/RSEQtools-0.6-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/r/RSEQtools/RSEQtools-0.6-goolf-1.4.10.eb
@@ -30,7 +30,7 @@ prebuildopts = 'export BIOINFOGSLDIR=$EBROOTGSL && export BIOINFOCONFDIR=conf &&
 prebuildopts += 'cd bios && make && make prod && cd - && '
 # now move to "mrf" folder, re-export the needed env var and run make
 prebuildopts += 'cd mrf && export BIOINFOCONFDIR=../bios/conf/ && '
- 
+
 parallel = 1
 
 # these are all the binaries compiled in "mrf" folder
@@ -38,8 +38,8 @@ binary_files = ["psl2mrf", "bowtie2mrf", "singleExport2mrf", "mrfSubsetByTargetN
                 "mrfQuantifier", "mrfAnnotationCoverage", "mrf2wig", "mrf2gff", "mrfSampler",
                 "mrf2bgr", "wigSegmenter", "mrfMappingBias", "mrfSelectRegion", "mrfSelectSpliced",
                 "mrfSelectAnnotated", "createSpliceJunctionLibrary", "gff2interval", "export2fastq",
-                "mergeTranscripts", "interval2gff", "interval2sequences", "bed2interval", 
-                "interval2bed", "mrf2sam", "sam2mrf", "mrfValidate", "bgrQuantifier", 
+                "mergeTranscripts", "interval2gff", "interval2sequences", "bed2interval",
+                "interval2bed", "mrf2sam", "sam2mrf", "mrfValidate", "bgrQuantifier",
                 "bgrSegmenter", "mrfCountRegion"]
 
 files_to_copy = [
diff --git a/easybuild/easyconfigs/r/rpy2/rpy2-2.4.3-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/r/rpy2/rpy2-2.4.3-goolf-1.4.10-Python-2.7.3.eb
index 463de39baad..7c80c0fb249 100644
--- a/easybuild/easyconfigs/r/rpy2/rpy2-2.4.3-goolf-1.4.10-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/r/rpy2/rpy2-2.4.3-goolf-1.4.10-Python-2.7.3.eb
@@ -12,7 +12,7 @@ toolchain = {'name': 'goolf', 'version': '1.4.10'}
 
 source_urls = ['https://pypi.python.org/packages/source/r/%(name)s']
 sources = [SOURCE_TAR_GZ]
-                                      
+
 python = 'Python'
 pyver = '2.7.3'
 pyshortver = '.'.join(pyver.split('.')[:2])
diff --git a/easybuild/easyconfigs/r/rpy2/rpy2-2.4.3-goolf-1.4.10-Python-3.2.3.eb b/easybuild/easyconfigs/r/rpy2/rpy2-2.4.3-goolf-1.4.10-Python-3.2.3.eb
index 5287791d7ca..2ad8592b89d 100644
--- a/easybuild/easyconfigs/r/rpy2/rpy2-2.4.3-goolf-1.4.10-Python-3.2.3.eb
+++ b/easybuild/easyconfigs/r/rpy2/rpy2-2.4.3-goolf-1.4.10-Python-3.2.3.eb
@@ -12,7 +12,7 @@ toolchain = {'name': 'goolf', 'version': '1.4.10'}
 
 source_urls = ['https://pypi.python.org/packages/source/r/%(name)s']
 sources = [SOURCE_TAR_GZ]
-                                      
+
 python = 'Python'
 pyver = '3.2.3'
 pyshortver = '.'.join(pyver.split('.')[:2])
diff --git a/easybuild/easyconfigs/s/SAMtools/SAMtools-1.1-foss-2014b.eb b/easybuild/easyconfigs/s/SAMtools/SAMtools-1.1-foss-2014b.eb
index a7bfe7aa518..37118ac1e18 100644
--- a/easybuild/easyconfigs/s/SAMtools/SAMtools-1.1-foss-2014b.eb
+++ b/easybuild/easyconfigs/s/SAMtools/SAMtools-1.1-foss-2014b.eb
@@ -28,6 +28,6 @@ dependencies = [
     ('zlib', '1.2.7'),
 ]
 
-parallel = 1 
+parallel = 1
 
 moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/s/SAMtools/SAMtools-1.1-goolf-1.4.10.eb b/easybuild/easyconfigs/s/SAMtools/SAMtools-1.1-goolf-1.4.10.eb
index 48efe7e0a74..ffeec869d84 100644
--- a/easybuild/easyconfigs/s/SAMtools/SAMtools-1.1-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/s/SAMtools/SAMtools-1.1-goolf-1.4.10.eb
@@ -30,6 +30,6 @@ dependencies = [
     ('zlib', '1.2.7'),
 ]
 
-parallel = 1 
+parallel = 1
 
 moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/s/SAMtools/SAMtools-1.1-intel-2014b.eb b/easybuild/easyconfigs/s/SAMtools/SAMtools-1.1-intel-2014b.eb
index 9993040cdb0..f6766acbd26 100644
--- a/easybuild/easyconfigs/s/SAMtools/SAMtools-1.1-intel-2014b.eb
+++ b/easybuild/easyconfigs/s/SAMtools/SAMtools-1.1-intel-2014b.eb
@@ -30,6 +30,6 @@ dependencies = [
     ('zlib', '1.2.7'),
 ]
 
-parallel = 1 
+parallel = 1
 
 moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/s/SAMtools/SAMtools-1.1-intel-2015a.eb b/easybuild/easyconfigs/s/SAMtools/SAMtools-1.1-intel-2015a.eb
index 91e58c27f08..805874583a9 100644
--- a/easybuild/easyconfigs/s/SAMtools/SAMtools-1.1-intel-2015a.eb
+++ b/easybuild/easyconfigs/s/SAMtools/SAMtools-1.1-intel-2015a.eb
@@ -30,6 +30,6 @@ dependencies = [
     ('zlib', '1.2.8'),
 ]
 
-parallel = 1 
+parallel = 1
 
 moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/s/SAMtools/SAMtools-1.2-foss-2015a-HTSlib-1.2.1.eb b/easybuild/easyconfigs/s/SAMtools/SAMtools-1.2-foss-2015a-HTSlib-1.2.1.eb
index c7743a27f3f..3835083700e 100644
--- a/easybuild/easyconfigs/s/SAMtools/SAMtools-1.2-foss-2015a-HTSlib-1.2.1.eb
+++ b/easybuild/easyconfigs/s/SAMtools/SAMtools-1.2-foss-2015a-HTSlib-1.2.1.eb
@@ -33,6 +33,6 @@ dependencies = [
     ('zlib', '1.2.8'),
 ]
 
-parallel = 1 
+parallel = 1
 
 moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/s/SAMtools/SAMtools-1.2-foss-2015a.eb b/easybuild/easyconfigs/s/SAMtools/SAMtools-1.2-foss-2015a.eb
index 227c52d47d0..be9360b7e58 100644
--- a/easybuild/easyconfigs/s/SAMtools/SAMtools-1.2-foss-2015a.eb
+++ b/easybuild/easyconfigs/s/SAMtools/SAMtools-1.2-foss-2015a.eb
@@ -28,6 +28,6 @@ dependencies = [
     ('zlib', '1.2.8'),
 ]
 
-parallel = 1 
+parallel = 1
 
 moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/s/SAMtools/SAMtools-1.2-foss-2015b.eb b/easybuild/easyconfigs/s/SAMtools/SAMtools-1.2-foss-2015b.eb
index 64891e6e5f2..598ba6e51e6 100644
--- a/easybuild/easyconfigs/s/SAMtools/SAMtools-1.2-foss-2015b.eb
+++ b/easybuild/easyconfigs/s/SAMtools/SAMtools-1.2-foss-2015b.eb
@@ -28,6 +28,6 @@ dependencies = [
     ('zlib', '1.2.8'),
 ]
 
-parallel = 1 
+parallel = 1
 
 moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/s/SAMtools/SAMtools-1.2-goolf-1.4.10.eb b/easybuild/easyconfigs/s/SAMtools/SAMtools-1.2-goolf-1.4.10.eb
index 15cb82566ef..97a147d8ecf 100644
--- a/easybuild/easyconfigs/s/SAMtools/SAMtools-1.2-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/s/SAMtools/SAMtools-1.2-goolf-1.4.10.eb
@@ -28,6 +28,6 @@ dependencies = [
     ('zlib', '1.2.7'),
 ]
 
-parallel = 1 
+parallel = 1
 
 moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/s/SAMtools/SAMtools-1.2-goolf-1.7.20.eb b/easybuild/easyconfigs/s/SAMtools/SAMtools-1.2-goolf-1.7.20.eb
index 695f8c6b45d..e3ff7301d8b 100644
--- a/easybuild/easyconfigs/s/SAMtools/SAMtools-1.2-goolf-1.7.20.eb
+++ b/easybuild/easyconfigs/s/SAMtools/SAMtools-1.2-goolf-1.7.20.eb
@@ -28,6 +28,6 @@ dependencies = [
     ('zlib', '1.2.8'),
 ]
 
-parallel = 1 
+parallel = 1
 
 moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/s/SAMtools/SAMtools-1.2-intel-2015a-HTSlib-1.2.1.eb b/easybuild/easyconfigs/s/SAMtools/SAMtools-1.2-intel-2015a-HTSlib-1.2.1.eb
index ccd00922016..28968768192 100644
--- a/easybuild/easyconfigs/s/SAMtools/SAMtools-1.2-intel-2015a-HTSlib-1.2.1.eb
+++ b/easybuild/easyconfigs/s/SAMtools/SAMtools-1.2-intel-2015a-HTSlib-1.2.1.eb
@@ -33,6 +33,6 @@ dependencies = [
     ('zlib', '1.2.8'),
 ]
 
-parallel = 1 
+parallel = 1
 
 moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/s/SCALCE/SCALCE-2.7-GCC-4.8.2.eb b/easybuild/easyconfigs/s/SCALCE/SCALCE-2.7-GCC-4.8.2.eb
index f442020c76e..d732b448eb4 100644
--- a/easybuild/easyconfigs/s/SCALCE/SCALCE-2.7-GCC-4.8.2.eb
+++ b/easybuild/easyconfigs/s/SCALCE/SCALCE-2.7-GCC-4.8.2.eb
@@ -30,7 +30,7 @@ buildopts = '-C zlib-1.2.8 && make all'
 files_to_copy = [(['scalce'], 'bin')]
 
 sanity_check_paths = {
-    'files': ["bin/scalce"], 
+    'files': ["bin/scalce"],
     'dirs': []
 }
 
diff --git a/easybuild/easyconfigs/s/SCOTCH/SCOTCH-6.0.4-intel-2015b-64bitint.eb b/easybuild/easyconfigs/s/SCOTCH/SCOTCH-6.0.4-intel-2015b-64bitint.eb
index edac27cad06..ba1a0a43d1d 100644
--- a/easybuild/easyconfigs/s/SCOTCH/SCOTCH-6.0.4-intel-2015b-64bitint.eb
+++ b/easybuild/easyconfigs/s/SCOTCH/SCOTCH-6.0.4-intel-2015b-64bitint.eb
@@ -1,6 +1,6 @@
 name = 'SCOTCH'
 version = '6.0.4'
-versionsuffix = '-64bitint' 
+versionsuffix = '-64bitint'
 
 homepage = 'http://gforge.inria.fr/projects/scotch/'
 description = """Software package and libraries for sequential and parallel graph partitioning,
diff --git a/easybuild/easyconfigs/s/SDCC/SDCC-3.3.0.eb b/easybuild/easyconfigs/s/SDCC/SDCC-3.3.0.eb
index b97860755cf..a74b423aa79 100644
--- a/easybuild/easyconfigs/s/SDCC/SDCC-3.3.0.eb
+++ b/easybuild/easyconfigs/s/SDCC/SDCC-3.3.0.eb
@@ -35,7 +35,7 @@ builddependencies = [
 configopts = "--disable-pic14-port --disable-pic16-port"
 
 sanity_check_paths = {
-    'files': ["bin/sdcc"], 
+    'files': ["bin/sdcc"],
     'dirs': []
 }
 
diff --git a/easybuild/easyconfigs/s/SIP/SIP-4.16.4-goolf-1.5.14-Python-2.7.9.eb b/easybuild/easyconfigs/s/SIP/SIP-4.16.4-goolf-1.5.14-Python-2.7.9.eb
index ecc7ac751ec..aaac9462ce8 100644
--- a/easybuild/easyconfigs/s/SIP/SIP-4.16.4-goolf-1.5.14-Python-2.7.9.eb
+++ b/easybuild/easyconfigs/s/SIP/SIP-4.16.4-goolf-1.5.14-Python-2.7.9.eb
@@ -9,7 +9,7 @@ version = '4.16.4'
 homepage = 'http://www.riverbankcomputing.com/software/sip/'
 description = """SIP is a tool that makes it very easy to create Python bindings for C and C++ libraries."""
 
-toolchain = {'name': 'goolf', 'version': '1.5.14'} 
+toolchain = {'name': 'goolf', 'version': '1.5.14'}
 
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = ['http://sourceforge.net/projects/pyqt/files/sip/sip-%(version)s']
diff --git a/easybuild/easyconfigs/s/SIP/SIP-4.16.4-intel-2015a-Python-2.7.9.eb b/easybuild/easyconfigs/s/SIP/SIP-4.16.4-intel-2015a-Python-2.7.9.eb
index 07105741358..f0dcc913e9f 100644
--- a/easybuild/easyconfigs/s/SIP/SIP-4.16.4-intel-2015a-Python-2.7.9.eb
+++ b/easybuild/easyconfigs/s/SIP/SIP-4.16.4-intel-2015a-Python-2.7.9.eb
@@ -9,7 +9,7 @@ version = '4.16.4'
 homepage = 'http://www.riverbankcomputing.com/software/sip/'
 description = """SIP is a tool that makes it very easy to create Python bindings for C and C++ libraries."""
 
-toolchain = {'name': 'intel', 'version': '2015a'} 
+toolchain = {'name': 'intel', 'version': '2015a'}
 
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = ['http://sourceforge.net/projects/pyqt/files/sip/sip-%(version)s']
diff --git a/easybuild/easyconfigs/s/SSAHA2/SSAHA2-2.5.5-i686.eb b/easybuild/easyconfigs/s/SSAHA2/SSAHA2-2.5.5-i686.eb
index c965b7304ff..0e8750aa56a 100644
--- a/easybuild/easyconfigs/s/SSAHA2/SSAHA2-2.5.5-i686.eb
+++ b/easybuild/easyconfigs/s/SSAHA2/SSAHA2-2.5.5-i686.eb
@@ -28,7 +28,7 @@ sanity_check_paths = {
 }
 
 # add the installation dir to PATH
-modextrapaths = { 
+modextrapaths = {
     'PATH': "",
 }
 
diff --git a/easybuild/easyconfigs/s/SSAHA2/SSAHA2-2.5.5-x86_64.eb b/easybuild/easyconfigs/s/SSAHA2/SSAHA2-2.5.5-x86_64.eb
index bb97c237d90..ea1f495c8a6 100644
--- a/easybuild/easyconfigs/s/SSAHA2/SSAHA2-2.5.5-x86_64.eb
+++ b/easybuild/easyconfigs/s/SSAHA2/SSAHA2-2.5.5-x86_64.eb
@@ -28,7 +28,7 @@ sanity_check_paths = {
 }
 
 # add the installation dir to PATH
-modextrapaths = { 
+modextrapaths = {
     'PATH': "",
 }
 
diff --git a/easybuild/easyconfigs/s/STAR/STAR-2.3.0e-goolf-1.4.10.eb b/easybuild/easyconfigs/s/STAR/STAR-2.3.0e-goolf-1.4.10.eb
index c428723fec1..c819f307db7 100644
--- a/easybuild/easyconfigs/s/STAR/STAR-2.3.0e-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/s/STAR/STAR-2.3.0e-goolf-1.4.10.eb
@@ -6,7 +6,7 @@
 easyblock = 'MakeCp'
 
 name = 'STAR'
-version = '2.3.0e' 
+version = '2.3.0e'
 
 homepage = 'https://code.google.com/p/rna-star/'
 description = """ STAR aligns RNA-seq reads to a reference genome using 
@@ -25,7 +25,7 @@ prebuildopts = 'rm STAR && '
 parallel = 1
 
 files_to_copy = [(["STAR"], "bin"), "README.txt"]
-        
+
 sanity_check_paths = {
     'files': ["bin/STAR"],
     'dirs': [],
diff --git a/easybuild/easyconfigs/s/STAR/STAR-2.5.0a-GNU-4.9.3-2.25.eb b/easybuild/easyconfigs/s/STAR/STAR-2.5.0a-GNU-4.9.3-2.25.eb
index 128fc5121a2..2a0e1ca5db4 100644
--- a/easybuild/easyconfigs/s/STAR/STAR-2.5.0a-GNU-4.9.3-2.25.eb
+++ b/easybuild/easyconfigs/s/STAR/STAR-2.5.0a-GNU-4.9.3-2.25.eb
@@ -6,7 +6,7 @@
 easyblock = 'MakeCp'
 
 name = 'STAR'
-version = '2.5.0a' 
+version = '2.5.0a'
 
 homepage = 'https://code.google.com/p/rna-star/'
 description = """ STAR aligns RNA-seq reads to a reference genome using 
@@ -23,7 +23,7 @@ prebuildopts = 'rm -fr bin/ && '
 parallel = 1
 
 files_to_copy = [(["source/STAR"], "bin"), "CHANGES.md", "doc", "extras", "LICENSE", "README.md", "RELEASEnotes.md"]
-        
+
 sanity_check_paths = {
     'files': ["bin/STAR"],
     'dirs': [],
diff --git a/easybuild/easyconfigs/s/STAR/STAR-2.5.0a-goolf-1.4.10.eb b/easybuild/easyconfigs/s/STAR/STAR-2.5.0a-goolf-1.4.10.eb
index 6a4e930918f..ab46efb39c6 100644
--- a/easybuild/easyconfigs/s/STAR/STAR-2.5.0a-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/s/STAR/STAR-2.5.0a-goolf-1.4.10.eb
@@ -6,7 +6,7 @@
 easyblock = 'MakeCp'
 
 name = 'STAR'
-version = '2.5.0a' 
+version = '2.5.0a'
 
 homepage = 'https://code.google.com/p/rna-star/'
 description = """ STAR aligns RNA-seq reads to a reference genome using 
@@ -23,7 +23,7 @@ prebuildopts = 'rm -fr bin/ && '
 parallel = 1
 
 files_to_copy = [(["source/STAR"], "bin"), "CHANGES.md", "doc", "extras", "LICENSE", "README.md", "RELEASEnotes.md"]
-        
+
 sanity_check_paths = {
     'files': ["bin/STAR"],
     'dirs': [],
diff --git a/easybuild/easyconfigs/s/Serf/Serf-1.3.8-foss-2015a.eb b/easybuild/easyconfigs/s/Serf/Serf-1.3.8-foss-2015a.eb
index febe7d2fb6a..0676f017661 100644
--- a/easybuild/easyconfigs/s/Serf/Serf-1.3.8-foss-2015a.eb
+++ b/easybuild/easyconfigs/s/Serf/Serf-1.3.8-foss-2015a.eb
@@ -30,7 +30,7 @@ osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
 buildopts = "APR=$EBROOTAPR/bin/apr-1-config APU=$EBROOTAPRMINUTIL/bin/apu-1-config"
 
 sanity_check_paths = {
-    'files': ['include/serf-1/serf.h'] + 
+    'files': ['include/serf-1/serf.h'] +
              ['lib/libserf-1.%s' % x for x in ['a', 'so']],
     'dirs': [],
 }
diff --git a/easybuild/easyconfigs/s/Subversion/Subversion-1.8.14-foss-2015a.eb b/easybuild/easyconfigs/s/Subversion/Subversion-1.8.14-foss-2015a.eb
index 9bae8b637e1..be6f1332e2d 100644
--- a/easybuild/easyconfigs/s/Subversion/Subversion-1.8.14-foss-2015a.eb
+++ b/easybuild/easyconfigs/s/Subversion/Subversion-1.8.14-foss-2015a.eb
@@ -31,4 +31,4 @@ sanity_check_paths = {
     'dirs': [],
 }
 
-moduleclass = 'tools' 
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/s/SuiteSparse/SuiteSparse-4.4.5-intel-2015b-METIS-5.1.0.eb b/easybuild/easyconfigs/s/SuiteSparse/SuiteSparse-4.4.5-intel-2015b-METIS-5.1.0.eb
index 49a8ba6fead..36dee081ede 100644
--- a/easybuild/easyconfigs/s/SuiteSparse/SuiteSparse-4.4.5-intel-2015b-METIS-5.1.0.eb
+++ b/easybuild/easyconfigs/s/SuiteSparse/SuiteSparse-4.4.5-intel-2015b-METIS-5.1.0.eb
@@ -11,7 +11,7 @@ source_urls = ['http://faculty.cse.tamu.edu/davis/SuiteSparse/']
 sources = [SOURCE_TAR_GZ]
 
 patches = [
-    'SuiteSparse-%(version)s_AMD_GNUMakefile.patch', 
+    'SuiteSparse-%(version)s_AMD_GNUMakefile.patch',
     'SuiteSparse-%(version)s_UMFPACK_GNUMakefile.patch',
 ]
 
diff --git a/easybuild/easyconfigs/s/Szip/Szip-2.1-goolf-1.5.14.eb b/easybuild/easyconfigs/s/Szip/Szip-2.1-goolf-1.5.14.eb
index ab15e564475..af861220378 100644
--- a/easybuild/easyconfigs/s/Szip/Szip-2.1-goolf-1.5.14.eb
+++ b/easybuild/easyconfigs/s/Szip/Szip-2.1-goolf-1.5.14.eb
@@ -6,7 +6,7 @@ version = '2.1'
 homepage = 'http://www.hdfgroup.org/doc_resource/SZIP/'
 description = "Szip compression software, providing lossless compression of scientific data"
 
-toolchain = {'name': 'goolf', 'version': '1.5.14'} 
+toolchain = {'name': 'goolf', 'version': '1.5.14'}
 toolchainopts = {'optarch': True, 'pic': True}
 
 source_urls = ['http://www.hdfgroup.org/ftp/lib-external/szip/%(version)s/src']
diff --git a/easybuild/easyconfigs/s/scikit-umfpack/scikit-umfpack-0.2.1-intel-2015b-Python-2.7.10.eb b/easybuild/easyconfigs/s/scikit-umfpack/scikit-umfpack-0.2.1-intel-2015b-Python-2.7.10.eb
index c30e04d554f..f47e1ccb983 100644
--- a/easybuild/easyconfigs/s/scikit-umfpack/scikit-umfpack-0.2.1-intel-2015b-Python-2.7.10.eb
+++ b/easybuild/easyconfigs/s/scikit-umfpack/scikit-umfpack-0.2.1-intel-2015b-Python-2.7.10.eb
@@ -23,7 +23,7 @@ dependencies = [
 
 builddependencies = [
     ('SWIG', '3.0.7', versionsuffix),
-] 
+]
 
 options = {'modulename': 'scikits'}
 
diff --git a/easybuild/easyconfigs/s/spglib/spglib-1.7.3-CrayGNU-5.2.40.eb b/easybuild/easyconfigs/s/spglib/spglib-1.7.3-CrayGNU-5.2.40.eb
index ebdf0c48b0e..f3db34a07ab 100644
--- a/easybuild/easyconfigs/s/spglib/spglib-1.7.3-CrayGNU-5.2.40.eb
+++ b/easybuild/easyconfigs/s/spglib/spglib-1.7.3-CrayGNU-5.2.40.eb
@@ -7,7 +7,7 @@ homepage = 'http://spglib.sourceforge.net/'
 description = """Spglib is a C library for finding and handling crystal symmetries."""
 
 toolchain = {'name': 'CrayGNU', 'version': '5.2.40'}
-toolchainopts = {'dynamic': True, } 
+toolchainopts = {'dynamic': True, }
 
 source_urls = [SOURCEFORGE_SOURCE]
 sources = [SOURCE_TAR_GZ]
diff --git a/easybuild/easyconfigs/t/TCC/TCC-0.9.26.eb b/easybuild/easyconfigs/t/TCC/TCC-0.9.26.eb
index e7a38fab790..9fc79c204d5 100644
--- a/easybuild/easyconfigs/t/TCC/TCC-0.9.26.eb
+++ b/easybuild/easyconfigs/t/TCC/TCC-0.9.26.eb
@@ -27,7 +27,7 @@ sources = [SOURCELOWER_TAR_BZ2]
 source_urls = ['http://download.savannah.nongnu.org/releases/tinycc/']
 
 sanity_check_paths = {
-    'files': ["bin/tcc"], 
+    'files': ["bin/tcc"],
     'dirs': []
 }
 
diff --git a/easybuild/easyconfigs/t/Trilinos/Trilinos-10.12.2-ictce-4.0.6-Python-2.7.3.eb b/easybuild/easyconfigs/t/Trilinos/Trilinos-10.12.2-ictce-4.0.6-Python-2.7.3.eb
index cc0fc985e00..fea45f6e5c3 100644
--- a/easybuild/easyconfigs/t/Trilinos/Trilinos-10.12.2-ictce-4.0.6-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/t/Trilinos/Trilinos-10.12.2-ictce-4.0.6-Python-2.7.3.eb
@@ -29,5 +29,5 @@ builddependencies = [('CMake', '2.8.4')]
 # Kokkos build is broken with ictce/4.0.6
 # yields internal error: 0_1670 for packages/kokkos/LinAlg/Kokkos_DefaultArithmetic.hpp (line 827)
 skip_exts = ["Kokkos", "Tpetra"]
- 
+
 moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/t/Trilinos/Trilinos-10.12.2-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/t/Trilinos/Trilinos-10.12.2-ictce-5.3.0-Python-2.7.3.eb
index a7d22afde05..84613e0ab25 100644
--- a/easybuild/easyconfigs/t/Trilinos/Trilinos-10.12.2-ictce-5.3.0-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/t/Trilinos/Trilinos-10.12.2-ictce-5.3.0-Python-2.7.3.eb
@@ -30,5 +30,5 @@ builddependencies = [('CMake', '2.8.4')]
 # Kokkos build is broken with ictce/4.0.6
 # yields internal error: 0_1670 for packages/kokkos/LinAlg/Kokkos_DefaultArithmetic.hpp (line 827)
 skip_exts = ["Kokkos", "Tpetra"]
- 
+
 moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/t/Trilinos/Trilinos-12.4.2-intel-2015b-Python-2.7.11.eb b/easybuild/easyconfigs/t/Trilinos/Trilinos-12.4.2-intel-2015b-Python-2.7.11.eb
index 465a84d1bb6..57bd77ec8b5 100644
--- a/easybuild/easyconfigs/t/Trilinos/Trilinos-12.4.2-intel-2015b-Python-2.7.11.eb
+++ b/easybuild/easyconfigs/t/Trilinos/Trilinos-12.4.2-intel-2015b-Python-2.7.11.eb
@@ -33,5 +33,5 @@ skip_exts = ['STKClassic', 'STKDoc_tests']
 
 # too parallel is too slow, and may cause build/tests to fail
 maxparallel = 10
- 
+
 moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/t/tcsh/tcsh-6.18.01-goolf-1.5.14.eb b/easybuild/easyconfigs/t/tcsh/tcsh-6.18.01-goolf-1.5.14.eb
index 2e710f4a1d9..5e7647f1830 100644
--- a/easybuild/easyconfigs/t/tcsh/tcsh-6.18.01-goolf-1.5.14.eb
+++ b/easybuild/easyconfigs/t/tcsh/tcsh-6.18.01-goolf-1.5.14.eb
@@ -21,7 +21,7 @@ description = """Tcsh is an enhanced, but completely compatible version of the B
   processor. It includes a command-line editor, programmable word completion, spelling correction, a history 
   mechanism, job control and a C-like syntax."""
 
-toolchain = {'name': 'goolf', 'version': '1.5.14'} 
+toolchain = {'name': 'goolf', 'version': '1.5.14'}
 
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = [
diff --git a/easybuild/easyconfigs/t/tmux/tmux-1.9a-GCC-4.9.2.eb b/easybuild/easyconfigs/t/tmux/tmux-1.9a-GCC-4.9.2.eb
index cd1b05dd17c..b34529fe922 100644
--- a/easybuild/easyconfigs/t/tmux/tmux-1.9a-GCC-4.9.2.eb
+++ b/easybuild/easyconfigs/t/tmux/tmux-1.9a-GCC-4.9.2.eb
@@ -19,7 +19,7 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files': ['bin/tmux'], 
+    'files': ['bin/tmux'],
     'dirs': []
 }
 
diff --git a/easybuild/easyconfigs/u/UDUNITS/UDUNITS-2.2.19-intel-2015a.eb b/easybuild/easyconfigs/u/UDUNITS/UDUNITS-2.2.19-intel-2015a.eb
index e9af43d2013..964a50f27f8 100644
--- a/easybuild/easyconfigs/u/UDUNITS/UDUNITS-2.2.19-intel-2015a.eb
+++ b/easybuild/easyconfigs/u/UDUNITS/UDUNITS-2.2.19-intel-2015a.eb
@@ -28,7 +28,7 @@ source_urls = ['ftp://ftp.unidata.ucar.edu/pub/udunits']
 dependencies = [('expat', '2.1.0')]
 
 sanity_check_paths = {
-    'files': ['bin/udunits2', 'include/converter.h', 'include/udunits2.h', 'include/udunits.h', 
+    'files': ['bin/udunits2', 'include/converter.h', 'include/udunits2.h', 'include/udunits.h',
               'lib/libudunits2.a', 'lib/libudunits2.%s' % SHLIB_EXT],
     'dirs': ['share'],
 }
diff --git a/easybuild/easyconfigs/u/UDUNITS/UDUNITS-2.2.19-intel-2015b.eb b/easybuild/easyconfigs/u/UDUNITS/UDUNITS-2.2.19-intel-2015b.eb
index 45c7bafac53..efdb4ae86f5 100644
--- a/easybuild/easyconfigs/u/UDUNITS/UDUNITS-2.2.19-intel-2015b.eb
+++ b/easybuild/easyconfigs/u/UDUNITS/UDUNITS-2.2.19-intel-2015b.eb
@@ -28,7 +28,7 @@ source_urls = ['ftp://ftp.unidata.ucar.edu/pub/udunits']
 dependencies = [('expat', '2.1.0')]
 
 sanity_check_paths = {
-    'files': ['bin/udunits2', 'include/converter.h', 'include/udunits2.h', 'include/udunits.h', 
+    'files': ['bin/udunits2', 'include/converter.h', 'include/udunits2.h', 'include/udunits.h',
               'lib/libudunits2.a', 'lib/libudunits2.%s' % SHLIB_EXT],
     'dirs': ['share'],
 }
diff --git a/easybuild/easyconfigs/w/WRF/WRF-3.5.1-goolf-1.5.14-dmpar.eb b/easybuild/easyconfigs/w/WRF/WRF-3.5.1-goolf-1.5.14-dmpar.eb
index aca6ed1e40a..8654cbea4e4 100644
--- a/easybuild/easyconfigs/w/WRF/WRF-3.5.1-goolf-1.5.14-dmpar.eb
+++ b/easybuild/easyconfigs/w/WRF/WRF-3.5.1-goolf-1.5.14-dmpar.eb
@@ -6,7 +6,7 @@ description = """The Weather Research and Forecasting (WRF) Model is a next-gene
  numerical weather prediction system designed to serve both operational forecasting and atmospheric
  research needs."""
 
-toolchain = {'name': 'goolf', 'version': '1.5.14'} 
+toolchain = {'name': 'goolf', 'version': '1.5.14'}
 toolchainopts = {'opt': False}  # don't use agressive optimization, stick to -O2
 
 sources = ['%(name)sV%(version)s.TAR.gz']
diff --git a/easybuild/easyconfigs/x/Xmipp/Xmipp-3.1-goolf-1.4.10-with-incl-deps.eb b/easybuild/easyconfigs/x/Xmipp/Xmipp-3.1-goolf-1.4.10-with-incl-deps.eb
index c1f4fa485c8..d9881b2ef71 100644
--- a/easybuild/easyconfigs/x/Xmipp/Xmipp-3.1-goolf-1.4.10-with-incl-deps.eb
+++ b/easybuild/easyconfigs/x/Xmipp/Xmipp-3.1-goolf-1.4.10-with-incl-deps.eb
@@ -7,10 +7,10 @@ description = "Xmipp is a suite of image processing programs, primarily aimed at
  
 source_urls = ['http://xmipp.cnb.csic.es/Downloads/']
 sources = ['Xmipp-%(version)s-src.tar.gz']
- 
+
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 
 # note: all other dependencies are taken care of by Xmipp itself
 dependencies = [('Java', '1.7.0_80', '', True)]
- 
+
 moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/x/xextproto/xextproto-7.3.0-intel-2014b.eb b/easybuild/easyconfigs/x/xextproto/xextproto-7.3.0-intel-2014b.eb
index 4ef466e9c69..d03ad18e50e 100644
--- a/easybuild/easyconfigs/x/xextproto/xextproto-7.3.0-intel-2014b.eb
+++ b/easybuild/easyconfigs/x/xextproto/xextproto-7.3.0-intel-2014b.eb
@@ -6,7 +6,7 @@ version = '7.3.0'
 homepage = "http://www.freedesktop.org/wiki/Software/xlibs"
 description = """XExtProto protocol headers."""
 
-toolchain = {'name': 'intel', 'version': '2014b'} 
+toolchain = {'name': 'intel', 'version': '2014b'}
 toolchainopts = {'optarch': True}
 
 sources = [SOURCE_TAR_GZ]
diff --git a/easybuild/easyconfigs/x/xextproto/xextproto-7.3.0-intel-2015a.eb b/easybuild/easyconfigs/x/xextproto/xextproto-7.3.0-intel-2015a.eb
index ee0ab26f86b..01075a73cf5 100644
--- a/easybuild/easyconfigs/x/xextproto/xextproto-7.3.0-intel-2015a.eb
+++ b/easybuild/easyconfigs/x/xextproto/xextproto-7.3.0-intel-2015a.eb
@@ -6,7 +6,7 @@ version = '7.3.0'
 homepage = "http://www.freedesktop.org/wiki/Software/xlibs"
 description = """XExtProto protocol headers."""
 
-toolchain = {'name': 'intel', 'version': '2015a'} 
+toolchain = {'name': 'intel', 'version': '2015a'}
 toolchainopts = {'optarch': True}
 
 sources = [SOURCE_TAR_GZ]
diff --git a/easybuild/easyconfigs/x/xextproto/xextproto-7.3.0-intel-2015b.eb b/easybuild/easyconfigs/x/xextproto/xextproto-7.3.0-intel-2015b.eb
index 5e95a7e8bdd..983804175f7 100644
--- a/easybuild/easyconfigs/x/xextproto/xextproto-7.3.0-intel-2015b.eb
+++ b/easybuild/easyconfigs/x/xextproto/xextproto-7.3.0-intel-2015b.eb
@@ -6,7 +6,7 @@ version = '7.3.0'
 homepage = "http://www.freedesktop.org/wiki/Software/xlibs"
 description = """XExtProto protocol headers."""
 
-toolchain = {'name': 'intel', 'version': '2015b'} 
+toolchain = {'name': 'intel', 'version': '2015b'}
 toolchainopts = {'optarch': True}
 
 sources = [SOURCE_TAR_GZ]
diff --git a/easybuild/easyconfigs/x/xproto/xproto-7.0.23-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/x/xproto/xproto-7.0.23-goalf-1.1.0-no-OFED.eb
index bb6336c3400..51a00b2812b 100644
--- a/easybuild/easyconfigs/x/xproto/xproto-7.0.23-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/x/xproto/xproto-7.0.23-goalf-1.1.0-no-OFED.eb
@@ -14,7 +14,7 @@ source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
 
 sanity_check_paths = {
                       'files' : ['include/X11/%s' % x for x in ['ap_keysym.h', 'HPkeysym.h', 'keysym.h', 'Xalloca.h',
-                                 'Xatom.h', 'XF86keysym.h', 'Xfuncs.h', 'Xmd.h', 'Xos.h', 'Xpoll.h', 'Xprotostr.h', 
+                                 'Xatom.h', 'XF86keysym.h', 'Xfuncs.h', 'Xmd.h', 'Xos.h', 'Xpoll.h', 'Xprotostr.h',
                                  'Xw32defs.h', 'Xwindows.h', 'DECkeysym.h', 'keysymdef.h', 'Sunkeysym.h', 'Xarch.h',
                                  'Xdefs.h', 'Xfuncproto.h', 'X.h', 'Xosdefs.h', 'Xos_r.h', 'Xproto.h', 'Xthreads.h',
                                  'XWDFile.h', 'Xwinsock.h']],
diff --git a/easybuild/easyconfigs/x/xproto/xproto-7.0.23-goolf-1.4.10.eb b/easybuild/easyconfigs/x/xproto/xproto-7.0.23-goolf-1.4.10.eb
index 6e21bf0fdc2..d17e8eb76f7 100644
--- a/easybuild/easyconfigs/x/xproto/xproto-7.0.23-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/x/xproto/xproto-7.0.23-goolf-1.4.10.eb
@@ -14,7 +14,7 @@ source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
 
 sanity_check_paths = {
     'files' : ['include/X11/%s' % x for x in ['ap_keysym.h', 'HPkeysym.h', 'keysym.h', 'Xalloca.h',
-               'Xatom.h', 'XF86keysym.h', 'Xfuncs.h', 'Xmd.h', 'Xos.h', 'Xpoll.h', 'Xprotostr.h', 
+               'Xatom.h', 'XF86keysym.h', 'Xfuncs.h', 'Xmd.h', 'Xos.h', 'Xpoll.h', 'Xprotostr.h',
                'Xw32defs.h', 'Xwindows.h', 'DECkeysym.h', 'keysymdef.h', 'Sunkeysym.h', 'Xarch.h',
                'Xdefs.h', 'Xfuncproto.h', 'X.h', 'Xosdefs.h', 'Xos_r.h', 'Xproto.h', 'Xthreads.h',
                'XWDFile.h', 'Xwinsock.h']],
diff --git a/easybuild/easyconfigs/x/xproto/xproto-7.0.23-goolf-1.5.14.eb b/easybuild/easyconfigs/x/xproto/xproto-7.0.23-goolf-1.5.14.eb
index 2837728722a..f34a19a9327 100644
--- a/easybuild/easyconfigs/x/xproto/xproto-7.0.23-goolf-1.5.14.eb
+++ b/easybuild/easyconfigs/x/xproto/xproto-7.0.23-goolf-1.5.14.eb
@@ -14,7 +14,7 @@ source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
 
 sanity_check_paths = {
     'files' : ['include/X11/%s' % x for x in ['ap_keysym.h', 'HPkeysym.h', 'keysym.h', 'Xalloca.h',
-               'Xatom.h', 'XF86keysym.h', 'Xfuncs.h', 'Xmd.h', 'Xos.h', 'Xpoll.h', 'Xprotostr.h', 
+               'Xatom.h', 'XF86keysym.h', 'Xfuncs.h', 'Xmd.h', 'Xos.h', 'Xpoll.h', 'Xprotostr.h',
                'Xw32defs.h', 'Xwindows.h', 'DECkeysym.h', 'keysymdef.h', 'Sunkeysym.h', 'Xarch.h',
                'Xdefs.h', 'Xfuncproto.h', 'X.h', 'Xosdefs.h', 'Xos_r.h', 'Xproto.h', 'Xthreads.h',
                'XWDFile.h', 'Xwinsock.h']],
diff --git a/easybuild/easyconfigs/x/xproto/xproto-7.0.23-ictce-4.0.6.eb b/easybuild/easyconfigs/x/xproto/xproto-7.0.23-ictce-4.0.6.eb
index d005dadc8e4..fd2b06fd616 100644
--- a/easybuild/easyconfigs/x/xproto/xproto-7.0.23-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/x/xproto/xproto-7.0.23-ictce-4.0.6.eb
@@ -14,7 +14,7 @@ source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
 
 sanity_check_paths = {
                       'files' : ['include/X11/%s' % x for x in ['ap_keysym.h', 'HPkeysym.h', 'keysym.h', 'Xalloca.h',
-                                 'Xatom.h', 'XF86keysym.h', 'Xfuncs.h', 'Xmd.h', 'Xos.h', 'Xpoll.h', 'Xprotostr.h', 
+                                 'Xatom.h', 'XF86keysym.h', 'Xfuncs.h', 'Xmd.h', 'Xos.h', 'Xpoll.h', 'Xprotostr.h',
                                  'Xw32defs.h', 'Xwindows.h', 'DECkeysym.h', 'keysymdef.h', 'Sunkeysym.h', 'Xarch.h',
                                  'Xdefs.h', 'Xfuncproto.h', 'X.h', 'Xosdefs.h', 'Xos_r.h', 'Xproto.h', 'Xthreads.h',
                                  'XWDFile.h', 'Xwinsock.h']],
diff --git a/easybuild/easyconfigs/x/xproto/xproto-7.0.23-ictce-5.3.0.eb b/easybuild/easyconfigs/x/xproto/xproto-7.0.23-ictce-5.3.0.eb
index 096a07bd53f..dad31a77b4f 100644
--- a/easybuild/easyconfigs/x/xproto/xproto-7.0.23-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/x/xproto/xproto-7.0.23-ictce-5.3.0.eb
@@ -15,7 +15,7 @@ source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
 
 sanity_check_paths = {
                       'files' : ['include/X11/%s' % x for x in ['ap_keysym.h', 'HPkeysym.h', 'keysym.h', 'Xalloca.h',
-                                 'Xatom.h', 'XF86keysym.h', 'Xfuncs.h', 'Xmd.h', 'Xos.h', 'Xpoll.h', 'Xprotostr.h', 
+                                 'Xatom.h', 'XF86keysym.h', 'Xfuncs.h', 'Xmd.h', 'Xos.h', 'Xpoll.h', 'Xprotostr.h',
                                  'Xw32defs.h', 'Xwindows.h', 'DECkeysym.h', 'keysymdef.h', 'Sunkeysym.h', 'Xarch.h',
                                  'Xdefs.h', 'Xfuncproto.h', 'X.h', 'Xosdefs.h', 'Xos_r.h', 'Xproto.h', 'Xthreads.h',
                                  'XWDFile.h', 'Xwinsock.h']],