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 a8e8be161119722960333773432e22ccf8e81c21..9ff4e547c06ce0e0846fd561ef1d6fad0c3fff74 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,8 +27,8 @@ sources = [('abinit-%s_%s.bz2' % (version, versionsuffix[1:]), 'tar xfj %s')]
 source_urls = ['http://ftp.abinit.org/']
 
 sanity_check_paths = {
-                      'files': ["bin/abinit"],
-                      'dirs': []
-                     }
+    'files': ["bin/abinit"],
+    'dirs': []
+}
 
 moduleclass = 'chem'
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 083d321a07d3795a9e963796cc41345d00bef2be..b5b040ce63bcea694f619032ce0e1b79d181de19 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,8 +29,8 @@ sources = [('abinit-%s_%s.bz2' % (version, versionsuffix[1:]), 'tar xfj %s')]
 source_urls = ['http://ftp.abinit.org/']
 
 sanity_check_paths = {
-                      'files': ["bin/abinit"],
-                      'dirs': []
-                     }
+    'files': ["bin/abinit"],
+    'dirs': []
+}
 
 moduleclass = 'chem'
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 5ccd2f15a76982121dde82b050ab35506f84a9ef..051d0927bf1ecbf0e44158a55db2266257116879 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,8 +30,8 @@ sources = [('abinit-%s_%s.bz2' % (version, versionsuffix[1:]), 'tar xfj %s')]
 source_urls = ['http://ftp.abinit.org/']
 
 sanity_check_paths = {
-                      'files': ["bin/abinit"],
-                      'dirs': []
-                     }
+    'files': ["bin/abinit"],
+    'dirs': []
+}
 
 moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/a/ABySS/ABySS-1.3.4-goalf-1.1.0-no-OFED-Python-2.7.3.eb b/easybuild/easyconfigs/a/ABySS/ABySS-1.3.4-goalf-1.1.0-no-OFED-Python-2.7.3.eb
index 570c4b562c91d58f8e0a1ef156ca72ae30ac3e2c..c096f680faf70cc1261b933e8208c38ce593c80b 100644
--- a/easybuild/easyconfigs/a/ABySS/ABySS-1.3.4-goalf-1.1.0-no-OFED-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/a/ABySS/ABySS-1.3.4-goalf-1.1.0-no-OFED-Python-2.7.3.eb
@@ -29,8 +29,8 @@ source_urls = ['http://www.bcgsc.ca/downloads/abyss/']
 dependencies = [('Boost', '1.49.0', versionsuffix)]
 
 sanity_check_paths = {
-                      'files': ["bin/ABYSS", "bin/ABYSS-P"],
-                      'dirs': []
-                     }
+    'files': ["bin/ABYSS", "bin/ABYSS-P"],
+    'dirs': []
+}
 
 moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/a/ABySS/ABySS-1.3.4-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/a/ABySS/ABySS-1.3.4-goolf-1.4.10-Python-2.7.3.eb
index 893dbac4abf8277a9ea1e31a16a576fd96b611a6..6d7dc91575a9cbdfa0e8bf4ceb0af6c397669036 100644
--- a/easybuild/easyconfigs/a/ABySS/ABySS-1.3.4-goolf-1.4.10-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/a/ABySS/ABySS-1.3.4-goolf-1.4.10-Python-2.7.3.eb
@@ -29,8 +29,8 @@ source_urls = ['http://www.bcgsc.ca/downloads/abyss/']
 dependencies = [('Boost', '1.49.0', versionsuffix)]
 
 sanity_check_paths = {
-                      'files': ["bin/ABYSS", "bin/ABYSS-P"],
-                      'dirs': []
-                     }
+    'files': ["bin/ABYSS", "bin/ABYSS-P"],
+    'dirs': []
+}
 
 moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/a/ABySS/ABySS-1.3.4-ictce-4.0.6-Python-2.7.3.eb b/easybuild/easyconfigs/a/ABySS/ABySS-1.3.4-ictce-4.0.6-Python-2.7.3.eb
index 47d31cf71556cc53774fd908eff87f96164d14bc..935dda43400a08845722f43bfcfd642c61565f3a 100644
--- a/easybuild/easyconfigs/a/ABySS/ABySS-1.3.4-ictce-4.0.6-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/a/ABySS/ABySS-1.3.4-ictce-4.0.6-Python-2.7.3.eb
@@ -29,8 +29,8 @@ source_urls = ['http://www.bcgsc.ca/downloads/abyss/']
 dependencies = [('Boost', '1.49.0', versionsuffix)]
 
 sanity_check_paths = {
-                      'files': ["bin/ABYSS", "bin/ABYSS-P"],
-                      'dirs': []
-                     }
+    'files': ["bin/ABYSS", "bin/ABYSS-P"],
+    'dirs': []
+}
 
 moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/a/ABySS/ABySS-1.3.4-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/a/ABySS/ABySS-1.3.4-ictce-5.3.0-Python-2.7.3.eb
index 8ce4ee39f134dbdbe4db6f8b239872e83eb0ce08..f7709440c32f09da9fddd408ac08b19a347bfb5e 100644
--- a/easybuild/easyconfigs/a/ABySS/ABySS-1.3.4-ictce-5.3.0-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/a/ABySS/ABySS-1.3.4-ictce-5.3.0-Python-2.7.3.eb
@@ -29,8 +29,8 @@ source_urls = ['http://www.bcgsc.ca/downloads/abyss/']
 dependencies = [('Boost', '1.49.0', versionsuffix)]
 
 sanity_check_paths = {
-                      'files': ["bin/ABYSS", "bin/ABYSS-P"],
-                      'dirs': []
-                     }
+    'files': ["bin/ABYSS", "bin/ABYSS-P"],
+    'dirs': []
+}
 
 moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/a/ADF/ADF-2014.02.eb b/easybuild/easyconfigs/a/ADF/ADF-2014.02.eb
new file mode 100644
index 0000000000000000000000000000000000000000..045e5244fde9823bc6ae0d11047ac403fa5285d2
--- /dev/null
+++ b/easybuild/easyconfigs/a/ADF/ADF-2014.02.eb
@@ -0,0 +1,31 @@
+easyblock = 'Tarball'
+
+name = 'ADF'
+version = '2014.02'
+
+homepage = 'http://www.scm.com/ADF/'
+description = """ADF is an accurate, parallelized, powerful computational chemistry program to understand and
+ predict chemical structure and reactivity with density functional theory (DFT)."""
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+sources = ['%(namelower)s%(version)s.pc64_linux.IntelMPI+CUDA.tgz']
+
+keepsymlinks = True
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['atomicdata', 'bin', 'examples'],
+}
+
+modextravars = {
+    'ADFHOME': '%(installdir)s',
+    'ADFBIN': '%(installdir)s/bin',
+    'ADFRESOURCES': '%(installdir)s/atomicdata',
+}
+
+modloadmsg = "These environment variables need to be defined before using ADF:\n"
+modloadmsg += "  * $SCMLICENSE: path to ADF license file\n"
+modloadmsg += "  * $SCM_TMPDIR: path to user scratch directory"
+
+moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/a/ADF/ADF-2014.11.r48287-intel-2016a.eb b/easybuild/easyconfigs/a/ADF/ADF-2014.11.r48287-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..21843552e81463d6e6cf4449756188b70c9811c4
--- /dev/null
+++ b/easybuild/easyconfigs/a/ADF/ADF-2014.11.r48287-intel-2016a.eb
@@ -0,0 +1,22 @@
+name = 'ADF'
+version = '2014.11.r48287'
+
+homepage = 'http://www.scm.com/ADF/'
+description = """ADF is an accurate, parallelized, powerful computational chemistry program to understand and
+ predict chemical structure and reactivity with density functional theory (DFT)."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+sources = [
+    '%(namelower)s%(version)s.src.tgz',
+    # no exact match on revision ID available, but not strictly needed
+    'fix2014.pc64_linux.intelmpi.r48660.2.555.bin.tgz',
+]
+
+license_file = HOME + "/licenses/ADF/license.txt"
+
+modloadmsg = "These environment variables need to be defined before using ADF:\n"
+modloadmsg += "  * $SCMLICENSE: path to ADF license file\n"
+modloadmsg += "  * $SCM_TMPDIR: path to user scratch directory"
+
+moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/a/AMOS/AMOS-3.1.0-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/a/AMOS/AMOS-3.1.0-goalf-1.1.0-no-OFED.eb
index 7204bb4bed9d4769b4e8b57bc4c018c44ee1ff30..42399e15399fa518994b360f1040c9371e1a8506 100644
--- a/easybuild/easyconfigs/a/AMOS/AMOS-3.1.0-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/a/AMOS/AMOS-3.1.0-goalf-1.1.0-no-OFED.eb
@@ -25,14 +25,14 @@ sources = [SOURCELOWER_TAR_GZ]
 source_urls = [('http://sourceforge.net/projects/amos/files/%s/%s' % (name.lower(), version), 'download')]
 
 dependencies = [
-                ('expat', '2.1.0'),
-                ('MUMmer', '3.23'),
-               ]
+    ('expat', '2.1.0'),
+    ('MUMmer', '3.23'),
+]
 
 sanity_check_paths = {
-                      'files': ['bin/AMOScmp', 'bin/AMOScmp-shortReads', 'bin/AMOScmp-shortReads-alignmentTrimmed' ],
-                      'dirs': []
-                     }
+    'files': ['bin/AMOScmp', 'bin/AMOScmp-shortReads', 'bin/AMOScmp-shortReads-alignmentTrimmed'],
+    'dirs': []
+}
 
 parallel = 1  # make crashes otherwise
 
diff --git a/easybuild/easyconfigs/a/AMOS/AMOS-3.1.0-goolf-1.4.10.eb b/easybuild/easyconfigs/a/AMOS/AMOS-3.1.0-goolf-1.4.10.eb
index 67f7c8c305bc1cb37c117de1e3f712f62b77c02a..e1a0148b757a055bbf655b4299eaf7a4bb487adf 100644
--- a/easybuild/easyconfigs/a/AMOS/AMOS-3.1.0-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/a/AMOS/AMOS-3.1.0-goolf-1.4.10.eb
@@ -27,14 +27,14 @@ source_urls = [('http://sourceforge.net/projects/amos/files/%s/%s' % (name.lower
 patches = ['AMOS-3.1.0_GCC-4.7.patch']
 
 dependencies = [
-                ('expat', '2.1.0'),
-                ('MUMmer', '3.23'),
-               ]
+    ('expat', '2.1.0'),
+    ('MUMmer', '3.23'),
+]
 
 sanity_check_paths = {
-                      'files': ['bin/AMOScmp', 'bin/AMOScmp-shortReads', 'bin/AMOScmp-shortReads-alignmentTrimmed' ],
-                      'dirs': []
-                     }
+    'files': ['bin/AMOScmp', 'bin/AMOScmp-shortReads', 'bin/AMOScmp-shortReads-alignmentTrimmed'],
+    'dirs': []
+}
 
 parallel = 1  # make crashes otherwise
 
diff --git a/easybuild/easyconfigs/a/AMOS/AMOS-3.1.0-ictce-4.0.6.eb b/easybuild/easyconfigs/a/AMOS/AMOS-3.1.0-ictce-4.0.6.eb
index e18be68931ec1bc6d57d99c045da224c77a18ca3..02a64a2c6f8ced2a97460cdb38237e946ec2dd1e 100644
--- a/easybuild/easyconfigs/a/AMOS/AMOS-3.1.0-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/a/AMOS/AMOS-3.1.0-ictce-4.0.6.eb
@@ -25,14 +25,14 @@ sources = [SOURCELOWER_TAR_GZ]
 source_urls = [('http://sourceforge.net/projects/amos/files/%s/%s' % (name.lower(), version), 'download')]
 
 dependencies = [
-                ('expat', '2.1.0'),
-                ('MUMmer', '3.23'),
-               ]
+    ('expat', '2.1.0'),
+    ('MUMmer', '3.23'),
+]
 
 sanity_check_paths = {
-                      'files': ['bin/AMOScmp', 'bin/AMOScmp-shortReads', 'bin/AMOScmp-shortReads-alignmentTrimmed' ],
-                      'dirs': []
-                     }
+    'files': ['bin/AMOScmp', 'bin/AMOScmp-shortReads', 'bin/AMOScmp-shortReads-alignmentTrimmed'],
+    'dirs': []
+}
 
 parallel = 1  # make crashes otherwise
 
diff --git a/easybuild/easyconfigs/a/AMOS/AMOS-3.1.0-ictce-5.3.0.eb b/easybuild/easyconfigs/a/AMOS/AMOS-3.1.0-ictce-5.3.0.eb
index 89797ac535945c0cce97cf372399bd1f06ae5038..7fce76229ecac59e6ac658af9f10f023594fcc9c 100644
--- a/easybuild/easyconfigs/a/AMOS/AMOS-3.1.0-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/a/AMOS/AMOS-3.1.0-ictce-5.3.0.eb
@@ -26,14 +26,14 @@ sources = [SOURCELOWER_TAR_GZ]
 source_urls = [('http://sourceforge.net/projects/amos/files/%s/%s' % (name.lower(), version), 'download')]
 
 dependencies = [
-                ('expat', '2.1.0'),
-                ('MUMmer', '3.23'),
-               ]
+    ('expat', '2.1.0'),
+    ('MUMmer', '3.23'),
+]
 
 sanity_check_paths = {
-                      'files': ['bin/AMOScmp', 'bin/AMOScmp-shortReads', 'bin/AMOScmp-shortReads-alignmentTrimmed' ],
-                      'dirs': []
-                     }
+    'files': ['bin/AMOScmp', 'bin/AMOScmp-shortReads', 'bin/AMOScmp-shortReads-alignmentTrimmed'],
+    'dirs': []
+}
 
 parallel = 1  # make crashes otherwise
 
diff --git a/easybuild/easyconfigs/a/ANSYS/ANSYS-15.0.eb b/easybuild/easyconfigs/a/ANSYS/ANSYS-15.0.eb
index 5836d2ff45bb0958d38cb651fc74a04f43726ffc..673a19b69da9037dd3537da93761782f1bfaa22e 100644
--- a/easybuild/easyconfigs/a/ANSYS/ANSYS-15.0.eb
+++ b/easybuild/easyconfigs/a/ANSYS/ANSYS-15.0.eb
@@ -8,8 +8,8 @@ description = """ANSYS simulation software enables organizations to confidently
 
 toolchain = {'name': 'dummy', 'version': 'dummy'}
 
-#create a zip file from the 3 install iso files.
-#make sure all files of the iso's are in the same directory.
+# create a zip file from the 3 install iso files.
+# make sure all files of the iso's are in the same directory.
 sources = ['ANSYS-15.0.zip']
 
 import os
diff --git a/easybuild/easyconfigs/a/ANSYS_CFD/ANSYS_CFD-17.0.eb b/easybuild/easyconfigs/a/ANSYS_CFD/ANSYS_CFD-17.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..0217d1be22fa531bdd2e6a4f694f03506a305fcc
--- /dev/null
+++ b/easybuild/easyconfigs/a/ANSYS_CFD/ANSYS_CFD-17.0.eb
@@ -0,0 +1,15 @@
+easyblock = 'EB_FLUENT'
+
+name = 'ANSYS_CFD'
+version = '17.0'
+
+homepage = 'http://www.ansys.com/Products/Simulation+Technology/Fluid+Dynamics'
+description = """ANSYS computational fluid dynamics (CFD) simulation software allows you to predict, with confidence,
+ the impact of fluid flows on your product throughout design and manufacturing as well as during end use.
+ ANSYS renowned CFD analysis tools include the widely used and well-validated ANSYS Fluent and ANSYS CFX."""
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+sources = ['FLUIDSTRUCTURES_%s_LINX64.tar' % ''.join(version.split('.'))]
+
+moduleclass = 'cae'
diff --git a/easybuild/easyconfigs/a/ARB/ARB-5.5-goolf-1.4.10.eb b/easybuild/easyconfigs/a/ARB/ARB-5.5-goolf-1.4.10.eb
index 5aa0f9160ced000586f4e85c794ac1a101cb1cdd..41b26e296f8ed285812956498e91bfe76efe47c3 100644
--- a/easybuild/easyconfigs/a/ARB/ARB-5.5-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/a/ARB/ARB-5.5-goolf-1.4.10.eb
@@ -24,7 +24,7 @@ dependencies = [
     ('makedepend', '1.0.4'),
     ('imake', '1.0.5'),
     ('libXt', '1.1.4'),
-    ('motif', '2.3.4'), # libXm
+    ('motif', '2.3.4'),  # libXm
     ('libXpm', '3.5.11'),
     ('libXaw', '1.0.12'),
     ('Perl', '5.16.3'),
diff --git a/easybuild/easyconfigs/a/ARB/ARB-5.5-ictce-4.1.13.eb b/easybuild/easyconfigs/a/ARB/ARB-5.5-ictce-4.1.13.eb
index 77b39fdaa5d5fe112d99a240d3f38b147b6b3161..7d9c072196ffec6b93cb3f473cc986d6d68813d7 100644
--- a/easybuild/easyconfigs/a/ARB/ARB-5.5-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/a/ARB/ARB-5.5-ictce-4.1.13.eb
@@ -24,7 +24,7 @@ dependencies = [
     ('makedepend', '1.0.4'),
     ('imake', '1.0.5'),
     ('libXt', '1.1.4'),
-    ('motif', '2.3.4'), # libXm
+    ('motif', '2.3.4'),  # libXm
     ('libXpm', '3.5.11'),
     ('libXaw', '1.0.12'),
     ('Perl', '5.16.3'),
diff --git a/easybuild/easyconfigs/a/ASE/ASE-3.6.0.2515-goalf-1.1.0-no-OFED-Python-2.7.3.eb b/easybuild/easyconfigs/a/ASE/ASE-3.6.0.2515-goalf-1.1.0-no-OFED-Python-2.7.3.eb
index d6c3ba40b8e25aefac516b94a926a3b48ae9c1d1..bb52b4b69d86c4ac87320aecaf1ef5368cd7c0e6 100644
--- a/easybuild/easyconfigs/a/ASE/ASE-3.6.0.2515-goalf-1.1.0-no-OFED-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/a/ASE/ASE-3.6.0.2515-goalf-1.1.0-no-OFED-Python-2.7.3.eb
@@ -18,12 +18,12 @@ pythonshortver = '.'.join(pythonver.split('.')[0:2])
 versionsuffix = '-%s-%s' % (python, pythonver)
 
 dependencies = [
-                (python, pythonver),
-               ]
+    (python, pythonver),
+]
 
 sanity_check_paths = {
-                      'files': ['bin/ag', 'bin/ase', 'bin/ASE2ase.py', 'bin/testase.py'],
-                      'dirs': ['lib/python%s/site-packages/%s' % (pythonshortver, name.lower())]
-                     }
+    'files': ['bin/ag', 'bin/ase', 'bin/ASE2ase.py', 'bin/testase.py'],
+    'dirs': ['lib/python%s/site-packages/%s' % (pythonshortver, name.lower())]
+}
 
 moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/a/ASE/ASE-3.6.0.2515-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/a/ASE/ASE-3.6.0.2515-goolf-1.4.10-Python-2.7.3.eb
index eccf705eddec6014a6ddcddff3c936f253a87671..dbbc53352ef3a768d42f1228c4dea3aae7a8c97a 100644
--- a/easybuild/easyconfigs/a/ASE/ASE-3.6.0.2515-goolf-1.4.10-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/a/ASE/ASE-3.6.0.2515-goolf-1.4.10-Python-2.7.3.eb
@@ -18,12 +18,12 @@ pythonshortver = '.'.join(pythonver.split('.')[0:2])
 versionsuffix = '-%s-%s' % (python, pythonver)
 
 dependencies = [
-                (python, pythonver),
-               ]
+    (python, pythonver),
+]
 
 sanity_check_paths = {
-                      'files': ['bin/ag', 'bin/ase', 'bin/ASE2ase.py', 'bin/testase.py'],
-                      'dirs': ['lib/python%s/site-packages/%s' % (pythonshortver, name.lower())]
-                     }
+    'files': ['bin/ag', 'bin/ase', 'bin/ASE2ase.py', 'bin/testase.py'],
+    'dirs': ['lib/python%s/site-packages/%s' % (pythonshortver, name.lower())]
+}
 
 moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/a/ASE/ASE-3.6.0.2515-ictce-4.0.6-Python-2.7.3.eb b/easybuild/easyconfigs/a/ASE/ASE-3.6.0.2515-ictce-4.0.6-Python-2.7.3.eb
index ea78c0bbca603c01c8aaa0dadafc677689533a23..3829980bc2b7d5899059a47258317807f2c0f496 100644
--- a/easybuild/easyconfigs/a/ASE/ASE-3.6.0.2515-ictce-4.0.6-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/a/ASE/ASE-3.6.0.2515-ictce-4.0.6-Python-2.7.3.eb
@@ -18,12 +18,12 @@ pythonshortver = '.'.join(pythonver.split('.')[0:2])
 versionsuffix = '-%s-%s' % (python, pythonver)
 
 dependencies = [
-                (python, pythonver),
-               ]
+    (python, pythonver),
+]
 
 sanity_check_paths = {
-                      'files': ['bin/ag', 'bin/ase', 'bin/ASE2ase.py', 'bin/testase.py'],
-                      'dirs': ['lib/python%s/site-packages/%s' % (pythonshortver, name.lower())]
-                     }
+    'files': ['bin/ag', 'bin/ase', 'bin/ASE2ase.py', 'bin/testase.py'],
+    'dirs': ['lib/python%s/site-packages/%s' % (pythonshortver, name.lower())]
+}
 
 moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/a/ASE/ASE-3.6.0.2515-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/a/ASE/ASE-3.6.0.2515-ictce-5.3.0-Python-2.7.3.eb
index 290c09c81ee4321a4ccbeb83fa363f3dc2474f88..de265b05d30e2a3fe376a2918d5cc5fa5d03ba0a 100644
--- a/easybuild/easyconfigs/a/ASE/ASE-3.6.0.2515-ictce-5.3.0-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/a/ASE/ASE-3.6.0.2515-ictce-5.3.0-Python-2.7.3.eb
@@ -19,12 +19,12 @@ pythonshortver = '.'.join(pythonver.split('.')[0:2])
 versionsuffix = '-%s-%s' % (python, pythonver)
 
 dependencies = [
-                (python, pythonver),
-               ]
+    (python, pythonver),
+]
 
 sanity_check_paths = {
-                      'files': ['bin/ag', 'bin/ase', 'bin/ASE2ase.py', 'bin/testase.py'],
-                      'dirs': ['lib/python%s/site-packages/%s' % (pythonshortver, name.lower())]
-                     }
+    'files': ['bin/ag', 'bin/ase', 'bin/ASE2ase.py', 'bin/testase.py'],
+    'dirs': ['lib/python%s/site-packages/%s' % (pythonshortver, name.lower())]
+}
 
 moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/a/ASE/ASE-3.9.1.4567-intel-2016a-Python-2.7.11.eb b/easybuild/easyconfigs/a/ASE/ASE-3.9.1.4567-intel-2016a-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..3078c635fc2601fe6ea69583d3e798e70821d8d1
--- /dev/null
+++ b/easybuild/easyconfigs/a/ASE/ASE-3.9.1.4567-intel-2016a-Python-2.7.11.eb
@@ -0,0 +1,28 @@
+easyblock = 'PythonPackage'
+
+name = 'ASE'
+version = '3.9.1.4567'
+
+homepage = 'https://wiki.fysik.dtu.dk/ase/'
+description = """ASE is a python package providing an open source Atomic Simulation Environment
+ in the Python scripting language."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+source_urls = ['https://wiki.fysik.dtu.dk/ase-files/']
+sources = ['python-%(namelower)s-%(version)s.tar.gz']
+
+pyver = '2.7.11'
+pyshortver = '.'.join(pyver.split('.')[:2])
+versionsuffix = '-Python-%s' % pyver
+
+dependencies = [
+    ('Python', pyver),
+]
+
+sanity_check_paths = {
+    'files': ['bin/ase-build', 'bin/ase-db', 'bin/ase-gui', 'bin/ase-info', 'bin/ase-run'],
+    'dirs': ['lib/python%s/site-packages/%%(namelower)s' % pyshortver],
+}
+
+moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/a/ATK/ATK-2.18.0-intel-2016a.eb b/easybuild/easyconfigs/a/ATK/ATK-2.18.0-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..81788119c4f04e8efef1c9eeece4d7c6adf8f680
--- /dev/null
+++ b/easybuild/easyconfigs/a/ATK/ATK-2.18.0-intel-2016a.eb
@@ -0,0 +1,35 @@
+easyblock = 'ConfigureMake'
+
+name = 'ATK'
+version = '2.18.0'
+
+homepage = 'https://developer.gnome.org/ATK/stable/'
+description = """
+ ATK provides the set of accessibility interfaces that are implemented by other
+ toolkits and applications. Using the ATK interfaces, accessibility tools have
+ full access to view and control running applications.
+"""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+source_urls = [FTPGNOME_SOURCE]
+sources = [SOURCELOWER_TAR_XZ]
+
+glibver = '2.47.5'
+dependencies = [
+    ('GLib', glibver),
+    ('GObject-Introspection', '1.47.1')
+]
+
+configopts = "--enable-introspection=yes"
+
+modextrapaths = {
+    'XDG_DATA_DIRS': 'share',
+}
+
+sanity_check_paths = {
+    'files': ['lib/libatk-1.0.%s' % SHLIB_EXT],
+    'dirs': [],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/a/ATLAS/ATLAS-3.8.4-gompi-1.1.0-no-OFED-LAPACK-3.4.0.eb b/easybuild/easyconfigs/a/ATLAS/ATLAS-3.8.4-gompi-1.1.0-no-OFED-LAPACK-3.4.0.eb
index ec567b4cbe8f40acaee8f6f44778a84b7d08d3f4..60ab20b7878207c8706e2d74645885de0dcc66b8 100644
--- a/easybuild/easyconfigs/a/ATLAS/ATLAS-3.8.4-gompi-1.1.0-no-OFED-LAPACK-3.4.0.eb
+++ b/easybuild/easyconfigs/a/ATLAS/ATLAS-3.8.4-gompi-1.1.0-no-OFED-LAPACK-3.4.0.eb
@@ -10,8 +10,8 @@ description = """ATLAS (Automatically Tuned Linear Algebra Software) is the appl
 toolchain = {'name': 'gompi', 'version': '1.1.0-no-OFED'}
 toolchainopts = {'pic': True}
 
-sources = ['%s%s.tar.bz2' % (name.lower(), version)]
-source_urls = [('http://sourceforge.net/projects/math-atlas/files/Stable/%s' % version, 'download')]
+sources = ['%(namelower)s%(version)s.tar.bz2']
+source_urls = [('http://sourceforge.net/projects/math-atlas/files/Stable/%(version)s', 'download')]
 
 lapack = 'LAPACK'
 lapackver = '3.4.0'
@@ -19,7 +19,7 @@ lapackver = '3.4.0'
 builddependencies = [(lapack, lapackver)]
 versionsuffix = '-%s-%s' % (lapack, lapackver)
 
-patches = ['ATLAS-3.8.4_illegal-instruction-fix.patch']
+patches = ['ATLAS-%(version)s_illegal-instruction-fix.patch']
 
 # build full LAPACK library with supplied netlib LAPACK
 full_lapack = True
diff --git a/easybuild/easyconfigs/a/ATLAS/ATLAS-3.8.4-gompi-1.1.0-no-OFED-with-shared-libs.eb b/easybuild/easyconfigs/a/ATLAS/ATLAS-3.8.4-gompi-1.1.0-no-OFED-with-shared-libs.eb
index 308e6f60355bc5a2423e8c3ad3314d680305d478..b85e7b5063a0fb8afe224b602863b945596729fe 100644
--- a/easybuild/easyconfigs/a/ATLAS/ATLAS-3.8.4-gompi-1.1.0-no-OFED-with-shared-libs.eb
+++ b/easybuild/easyconfigs/a/ATLAS/ATLAS-3.8.4-gompi-1.1.0-no-OFED-with-shared-libs.eb
@@ -11,12 +11,13 @@ description = """ATLAS (Automatically Tuned Linear Algebra Software) is the appl
 toolchain = {'name': 'gompi', 'version': '1.1.0-no-OFED'}
 toolchainopts = {'pic': True}
 
-sources = ['%s%s.tar.bz2' % (name.lower(), version)]
-source_urls = [('http://sourceforge.net/projects/math-atlas/files/Stable/%s' % version, 'download')]
+sources = ['%(namelower)s%(version)s.tar.bz2']
+source_urls = [('http://sourceforge.net/projects/math-atlas/files/Stable/%(version)s', 'download')]
 
-patches = ['ATLAS-3.8.4_illegal-instruction-fix.patch',
-           'ATLAS-3.8.4_make-install-shared.patch'
-          ]
+patches = [
+    'ATLAS-%(version)s_illegal-instruction-fix.patch',
+    'ATLAS-%(version)s_make-install-shared.patch',
+]
 
 # fix for http://math-atlas.sourceforge.net/errata.html#sharedProbe
 configopts = "-Ss f77lib '-L${EBROOTGCC}/lib64 -lgfortran'"
diff --git a/easybuild/easyconfigs/a/ATLAS/ATLAS-3.8.4-gompi-1.1.0-no-OFED.eb b/easybuild/easyconfigs/a/ATLAS/ATLAS-3.8.4-gompi-1.1.0-no-OFED.eb
index 5fa842f1c8762f9630d792987577f764537740d2..d541339cb7ecfa39989723031271c3ef905cfbee 100644
--- a/easybuild/easyconfigs/a/ATLAS/ATLAS-3.8.4-gompi-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/a/ATLAS/ATLAS-3.8.4-gompi-1.1.0-no-OFED.eb
@@ -10,10 +10,10 @@ description = """ATLAS (Automatically Tuned Linear Algebra Software) is the appl
 toolchain = {'name': 'gompi', 'version': '1.1.0-no-OFED'}
 toolchainopts = {'pic': True}
 
-sources = ['%s%s.tar.bz2' % (name.lower(), version)]
-source_urls = [('http://sourceforge.net/projects/math-atlas/files/Stable/%s' % version, 'download')]
+sources = ['%(namelower)s%(version)s.tar.bz2']
+source_urls = [('http://sourceforge.net/projects/math-atlas/files/Stable/%(version)s', 'download')]
 
-patches = ['ATLAS-3.8.4_illegal-instruction-fix.patch']
+patches = ['ATLAS-%(version)s_illegal-instruction-fix.patch']
 
 # fix for http://math-atlas.sourceforge.net/errata.html#sharedProbe
 configopts = "-Ss f77lib '-L$(EBTROOTGCC)/lib64 -lgfortran'"
diff --git a/easybuild/easyconfigs/a/AutoDock_Vina/AutoDock_Vina-1.1.2_linux_x86.eb b/easybuild/easyconfigs/a/AutoDock_Vina/AutoDock_Vina-1.1.2_linux_x86.eb
index a27cf3bd195f755b9363dd8a834016928b2ac723..98f8c2275a93be4996c2b82ff448b28398c5b38c 100644
--- a/easybuild/easyconfigs/a/AutoDock_Vina/AutoDock_Vina-1.1.2_linux_x86.eb
+++ b/easybuild/easyconfigs/a/AutoDock_Vina/AutoDock_Vina-1.1.2_linux_x86.eb
@@ -15,7 +15,7 @@ description = """ AutoDock Vina is an open-source program for doing molecular do
 toolchain = {'name': 'dummy', 'version': 'dummy'}
 
 source_urls = ['http://vina.scripps.edu/download/']
-sources = ['%s_%s%s.tgz' % (name.lower(), version.replace('.','_'), versionsuffix)]
+sources = ['%s_%s%s.tgz' % (name.lower(), version.replace('.', '_'), versionsuffix)]
 
 sanity_check_paths = {
     'files': ["bin/vina_split", "bin/vina"],
diff --git a/easybuild/easyconfigs/a/Automake/Automake-1.15-ictce-5.5.0.eb b/easybuild/easyconfigs/a/Automake/Automake-1.15-ictce-5.5.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..25677b6f64982414f3f8b5321e0b741c4c28a7b1
--- /dev/null
+++ b/easybuild/easyconfigs/a/Automake/Automake-1.15-ictce-5.5.0.eb
@@ -0,0 +1,33 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2012-2014 Uni.Lu/LCSB, NTUA
+# Authors::   Fotis Georgatos <fotis@cern.ch>
+# License::   MIT/GPL
+# $Id$
+#
+# This work implements a part of the HPCBIOS project and is a component of the policy:
+# http://hpcbios.readthedocs.org/en/latest/
+##
+
+easyblock = 'ConfigureMake'
+
+name = 'Automake'
+version = "1.15"
+
+homepage = 'http://www.gnu.org/software/automake/automake.html'
+description = "Automake: GNU Standards-compliant Makefile generator"
+
+toolchain = {'name': 'ictce', 'version': '5.5.0'}
+
+source_urls = [GNU_SOURCE]
+sources = [SOURCELOWER_TAR_GZ]
+
+dependencies = [('Autoconf', '2.69')]
+
+sanity_check_paths = {
+    'files': ['bin/automake', 'bin/aclocal'],
+    'dirs': []
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/a/Autotools/Autotools-20150119-GCC-4.9.2.eb b/easybuild/easyconfigs/a/Autotools/Autotools-20150119-GCC-4.9.2.eb
index 067ccdbe63f0dedb0f824ff71c8e16acb7db9968..66216b2e543c3806d9950be75f5062a93109aa06 100644
--- a/easybuild/easyconfigs/a/Autotools/Autotools-20150119-GCC-4.9.2.eb
+++ b/easybuild/easyconfigs/a/Autotools/Autotools-20150119-GCC-4.9.2.eb
@@ -1,7 +1,7 @@
 easyblock = 'Bundle'
 
 name = 'Autotools'
-version = '20150119' # date of the most recent change
+version = '20150119'  # date of the most recent change
 
 homepage = 'http://autotools.io'
 description = """This bundle collect the standard GNU build tools: Autoconf, Automake and libtool"""
@@ -9,9 +9,9 @@ description = """This bundle collect the standard GNU build tools: Autoconf, Aut
 toolchain = {'name': 'GCC', 'version': '4.9.2'}
 
 dependencies = [
-    ('Autoconf', '2.69'), # 20120424
-    ('Automake', '1.15'), # 20150105
-    ('libtool', '2.4.5'), # 20150119
+    ('Autoconf', '2.69'),  # 20120424
+    ('Automake', '1.15'),  # 20150105
+    ('libtool', '2.4.5'),  # 20150119
 ]
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/a/Autotools/Autotools-20150215-GCC-4.7.2.eb b/easybuild/easyconfigs/a/Autotools/Autotools-20150215-GCC-4.7.2.eb
index 7f04debe9c1bca7fd694fc4dd21fcff6442e594e..d72ed94ae6d6812980df15750d3a21083dde5888 100644
--- a/easybuild/easyconfigs/a/Autotools/Autotools-20150215-GCC-4.7.2.eb
+++ b/easybuild/easyconfigs/a/Autotools/Autotools-20150215-GCC-4.7.2.eb
@@ -9,9 +9,9 @@ description = """This bundle collect the standard GNU build tools: Autoconf, Aut
 toolchain = {'name': 'GCC', 'version': '4.7.2'}
 
 dependencies = [
-    ('Autoconf', '2.69'), # 20120424
-    ('Automake', '1.15'), # 20150105
-    ('libtool', '2.4.6'), # 20150215
+    ('Autoconf', '2.69'),  # 20120424
+    ('Automake', '1.15'),  # 20150105
+    ('libtool', '2.4.6'),  # 20150215
 ]
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/a/Autotools/Autotools-20150215-GCC-4.8.4.eb b/easybuild/easyconfigs/a/Autotools/Autotools-20150215-GCC-4.8.4.eb
index 357867c5863a8f599d9048d72961a41219516726..cdbc43842999ac575a51157564fe9f54a84433f1 100644
--- a/easybuild/easyconfigs/a/Autotools/Autotools-20150215-GCC-4.8.4.eb
+++ b/easybuild/easyconfigs/a/Autotools/Autotools-20150215-GCC-4.8.4.eb
@@ -9,9 +9,9 @@ description = """This bundle collect the standard GNU build tools: Autoconf, Aut
 toolchain = {'name': 'GCC', 'version': '4.8.4'}
 
 dependencies = [
-    ('Autoconf', '2.69'), # 20120424
-    ('Automake', '1.15'), # 20150105
-    ('libtool', '2.4.6'), # 20150215
+    ('Autoconf', '2.69'),  # 20120424
+    ('Automake', '1.15'),  # 20150105
+    ('libtool', '2.4.6'),  # 20150215
 ]
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/a/Autotools/Autotools-20150215-GCC-4.9.2.eb b/easybuild/easyconfigs/a/Autotools/Autotools-20150215-GCC-4.9.2.eb
index 9fe586bfbb756e6dbec876fc828c0c82ec110555..2b3b95424efb3232c4b4cde9cb38d606150d0134 100644
--- a/easybuild/easyconfigs/a/Autotools/Autotools-20150215-GCC-4.9.2.eb
+++ b/easybuild/easyconfigs/a/Autotools/Autotools-20150215-GCC-4.9.2.eb
@@ -9,9 +9,9 @@ description = """This bundle collect the standard GNU build tools: Autoconf, Aut
 toolchain = {'name': 'GCC', 'version': '4.9.2'}
 
 dependencies = [
-    ('Autoconf', '2.69'), # 20120424
-    ('Automake', '1.15'), # 20150105
-    ('libtool', '2.4.6'), # 20150215
+    ('Autoconf', '2.69'),  # 20120424
+    ('Automake', '1.15'),  # 20150105
+    ('libtool', '2.4.6'),  # 20150215
 ]
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/a/Autotools/Autotools-20150215-GCC-4.9.3-2.25.eb b/easybuild/easyconfigs/a/Autotools/Autotools-20150215-GCC-4.9.3-2.25.eb
index 8870d76965ff3e2306bddda455af1149d63edf7e..b735d846baf29870e7b83b0d2acacd96e94aa5df 100644
--- a/easybuild/easyconfigs/a/Autotools/Autotools-20150215-GCC-4.9.3-2.25.eb
+++ b/easybuild/easyconfigs/a/Autotools/Autotools-20150215-GCC-4.9.3-2.25.eb
@@ -9,9 +9,9 @@ description = """This bundle collect the standard GNU build tools: Autoconf, Aut
 toolchain = {'name': 'GCC', 'version': '4.9.3-2.25'}
 
 dependencies = [
-    ('Autoconf', '2.69'), # 20120424
-    ('Automake', '1.15'), # 20150105
-    ('libtool', '2.4.6'), # 20150215
+    ('Autoconf', '2.69'),  # 20120424
+    ('Automake', '1.15'),  # 20150105
+    ('libtool', '2.4.6'),  # 20150215
 ]
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/a/Autotools/Autotools-20150215-GNU-4.9.2-2.25.eb b/easybuild/easyconfigs/a/Autotools/Autotools-20150215-GNU-4.9.2-2.25.eb
index 25b293c3c4fb1235a05172f2414ad2a7add5bc05..f3b03541781c1128db270912278e388166a7a613 100644
--- a/easybuild/easyconfigs/a/Autotools/Autotools-20150215-GNU-4.9.2-2.25.eb
+++ b/easybuild/easyconfigs/a/Autotools/Autotools-20150215-GNU-4.9.2-2.25.eb
@@ -9,9 +9,9 @@ description = """This bundle collect the standard GNU build tools: Autoconf, Aut
 toolchain = {'name': 'GNU', 'version': '4.9.2-2.25'}
 
 dependencies = [
-    ('Autoconf', '2.69'), # 20120424
-    ('Automake', '1.15'), # 20150105
-    ('libtool', '2.4.6'), # 20150215
+    ('Autoconf', '2.69'),  # 20120424
+    ('Automake', '1.15'),  # 20150105
+    ('libtool', '2.4.6'),  # 20150215
 ]
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/a/Autotools/Autotools-20150215-GNU-4.9.3-2.25.eb b/easybuild/easyconfigs/a/Autotools/Autotools-20150215-GNU-4.9.3-2.25.eb
index 80fa06d91be10b6a435dc76d31a5eb6f2b253830..c1363ba80491d6e0dc2751704d2edd0e49f8b40f 100644
--- a/easybuild/easyconfigs/a/Autotools/Autotools-20150215-GNU-4.9.3-2.25.eb
+++ b/easybuild/easyconfigs/a/Autotools/Autotools-20150215-GNU-4.9.3-2.25.eb
@@ -9,9 +9,9 @@ description = """This bundle collect the standard GNU build tools: Autoconf, Aut
 toolchain = {'name': 'GNU', 'version': '4.9.3-2.25'}
 
 dependencies = [
-    ('Autoconf', '2.69'), # 20120424
-    ('Automake', '1.15'), # 20150105
-    ('libtool', '2.4.6'), # 20150215
+    ('Autoconf', '2.69'),  # 20120424
+    ('Automake', '1.15'),  # 20150105
+    ('libtool', '2.4.6'),  # 20150215
 ]
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/a/Autotools/Autotools-20150215-GNU-5.1.0-2.25.eb b/easybuild/easyconfigs/a/Autotools/Autotools-20150215-GNU-5.1.0-2.25.eb
index 0d6c26a78c1a07f9750c421fff89738bf6c4a80f..cac7fe9cded8fdd93990628b1e1a371a2dd2bb07 100644
--- a/easybuild/easyconfigs/a/Autotools/Autotools-20150215-GNU-5.1.0-2.25.eb
+++ b/easybuild/easyconfigs/a/Autotools/Autotools-20150215-GNU-5.1.0-2.25.eb
@@ -9,9 +9,9 @@ description = """This bundle collect the standard GNU build tools: Autoconf, Aut
 toolchain = {'name': 'GNU', 'version': '5.1.0-2.25'}
 
 dependencies = [
-    ('Autoconf', '2.69'), # 20120424
-    ('Automake', '1.15'), # 20150105
-    ('libtool', '2.4.6'), # 20150215
+    ('Autoconf', '2.69'),  # 20120424
+    ('Automake', '1.15'),  # 20150105
+    ('libtool', '2.4.6'),  # 20150215
 ]
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/a/Autotools/Autotools-20150215-foss-2015a.eb b/easybuild/easyconfigs/a/Autotools/Autotools-20150215-foss-2015a.eb
index 6a68f164a9c7c37e268a44939064a23ab94b9aa0..474b894ca2906d249b046f093acaeee024f17f32 100644
--- a/easybuild/easyconfigs/a/Autotools/Autotools-20150215-foss-2015a.eb
+++ b/easybuild/easyconfigs/a/Autotools/Autotools-20150215-foss-2015a.eb
@@ -9,9 +9,9 @@ description = """This bundle collect the standard GNU build tools: Autoconf, Aut
 toolchain = {'name': 'foss', 'version': '2015a'}
 
 dependencies = [
-    ('Autoconf', '2.69'), # 20120424
-    ('Automake', '1.15'), # 20150105
-    ('libtool', '2.4.6'), # 20150215
+    ('Autoconf', '2.69'),  # 20120424
+    ('Automake', '1.15'),  # 20150105
+    ('libtool', '2.4.6'),  # 20150215
 ]
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/a/Autotools/Autotools-20150215-foss-2016a.eb b/easybuild/easyconfigs/a/Autotools/Autotools-20150215-foss-2016a.eb
index a07bbf4e2558bcc3087b1294d8faad8400e6dec5..b640e29fa5cc3ac996fcaa5013b83b67585c0f63 100644
--- a/easybuild/easyconfigs/a/Autotools/Autotools-20150215-foss-2016a.eb
+++ b/easybuild/easyconfigs/a/Autotools/Autotools-20150215-foss-2016a.eb
@@ -9,9 +9,9 @@ description = """This bundle collect the standard GNU build tools: Autoconf, Aut
 toolchain = {'name': 'foss', 'version': '2016a'}
 
 dependencies = [
-    ('Autoconf', '2.69'), # 20120424
-    ('Automake', '1.15'), # 20150105
-    ('libtool', '2.4.6'), # 20150215
+    ('Autoconf', '2.69'),  # 20120424
+    ('Automake', '1.15'),  # 20150105
+    ('libtool', '2.4.6'),  # 20150215
 ]
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/a/Autotools/Autotools-20150215-ictce-5.5.0.eb b/easybuild/easyconfigs/a/Autotools/Autotools-20150215-ictce-5.5.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..72e186977db67df0b605c946cfc188fb75b933ef
--- /dev/null
+++ b/easybuild/easyconfigs/a/Autotools/Autotools-20150215-ictce-5.5.0.eb
@@ -0,0 +1,17 @@
+easyblock = 'Bundle'
+
+name = 'Autotools'
+version = '20150215'  # date of the most recent change
+
+homepage = 'http://autotools.io'
+description = """This bundle collect the standard GNU build tools: Autoconf, Automake and libtool"""
+
+toolchain = {'name': 'ictce', 'version': '5.5.0'}
+
+dependencies = [
+    ('Autoconf', '2.69'),  # 20120424
+    ('Automake', '1.15'),  # 20150105
+    ('libtool', '2.4.6'),  # 20150215
+]
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/a/Autotools/Autotools-20150215-intel-2015b.eb b/easybuild/easyconfigs/a/Autotools/Autotools-20150215-intel-2015b.eb
index 7677218c9440c6f82c9df3ad0b8b9cef944f4fe8..82ab19bc9379361bbf15cb42ce1673574507f837 100644
--- a/easybuild/easyconfigs/a/Autotools/Autotools-20150215-intel-2015b.eb
+++ b/easybuild/easyconfigs/a/Autotools/Autotools-20150215-intel-2015b.eb
@@ -9,9 +9,9 @@ description = """This bundle collect the standard GNU build tools: Autoconf, Aut
 toolchain = {'name': 'intel', 'version': '2015b'}
 
 dependencies = [
-    ('Autoconf', '2.69'), # 20120424
-    ('Automake', '1.15'), # 20150105
-    ('libtool', '2.4.6'), # 20150215
+    ('Autoconf', '2.69'),  # 20120424
+    ('Automake', '1.15'),  # 20150105
+    ('libtool', '2.4.6'),  # 20150215
 ]
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/a/Autotools/Autotools-20150215-intel-2016a.eb b/easybuild/easyconfigs/a/Autotools/Autotools-20150215-intel-2016a.eb
index 0810dfe53647e2d4ea84587539bb9a9b9269364a..caa4818cd692546c9dfba0426f6d7720e21e664b 100644
--- a/easybuild/easyconfigs/a/Autotools/Autotools-20150215-intel-2016a.eb
+++ b/easybuild/easyconfigs/a/Autotools/Autotools-20150215-intel-2016a.eb
@@ -9,9 +9,9 @@ description = """This bundle collect the standard GNU build tools: Autoconf, Aut
 toolchain = {'name': 'intel', 'version': '2016a'}
 
 dependencies = [
-    ('Autoconf', '2.69'), # 20120424
-    ('Automake', '1.15'), # 20150105
-    ('libtool', '2.4.6'), # 20150215
+    ('Autoconf', '2.69'),  # 20120424
+    ('Automake', '1.15'),  # 20150105
+    ('libtool', '2.4.6'),  # 20150215
 ]
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/a/Autotools/Autotools-20150215.eb b/easybuild/easyconfigs/a/Autotools/Autotools-20150215.eb
index 6763feae560cec3eeae7298b6c97b4df92e34f1e..af33b5e023222dd764d3f79b0c2afdb6de61d4a0 100644
--- a/easybuild/easyconfigs/a/Autotools/Autotools-20150215.eb
+++ b/easybuild/easyconfigs/a/Autotools/Autotools-20150215.eb
@@ -9,9 +9,9 @@ description = """This bundle collect the standard GNU build tools: Autoconf, Aut
 toolchain = {'name': 'dummy', 'version': ''}
 
 dependencies = [
-    ('Autoconf', '2.69'), # 20120424
-    ('Automake', '1.15'), # 20150105
-    ('libtool', '2.4.6'), # 20150215
+    ('Autoconf', '2.69'),  # 20120424
+    ('Automake', '1.15'),  # 20150105
+    ('libtool', '2.4.6'),  # 20150215
 ]
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/a/animation/animation-2.4-intel-2015b-R-3.2.1.eb b/easybuild/easyconfigs/a/animation/animation-2.4-intel-2015b-R-3.2.1.eb
index 9260cfb55214dcc1475cbf563444566cdfebc519..871016656bec6007e14c7e369c8d79c81d3e18d3 100644
--- a/easybuild/easyconfigs/a/animation/animation-2.4-intel-2015b-R-3.2.1.eb
+++ b/easybuild/easyconfigs/a/animation/animation-2.4-intel-2015b-R-3.2.1.eb
@@ -20,7 +20,7 @@ versionsuffix = '-%s-%s' % (r, rver)
 
 dependencies = [
     (r, rver),
-    ('ffmpeg', '2.8'),
+    ('FFmpeg', '2.8'),
     ('GraphicsMagick', '1.3.21'),
 ]
 
diff --git a/easybuild/easyconfigs/a/ant/ant-1.9.6-Java-1.7.0_75.eb b/easybuild/easyconfigs/a/ant/ant-1.9.6-Java-1.7.0_75.eb
new file mode 100644
index 0000000000000000000000000000000000000000..7da7aa32db660ca1155cce7adcd65c6eeabaf168
--- /dev/null
+++ b/easybuild/easyconfigs/a/ant/ant-1.9.6-Java-1.7.0_75.eb
@@ -0,0 +1,26 @@
+name = 'ant'
+version = '1.9.6'
+
+homepage = 'http://ant.apache.org/'
+description = """Apache Ant is a Java library and command-line tool whose mission is to drive processes described in build files
+ as targets and extension points dependent upon each other. The main known usage of Ant is the build of Java applications."""
+
+toolchain = {'name': 'dummy', 'version': ''}
+
+sources = ['apache-%(name)s-%(version)s-src.tar.gz']
+source_urls = ['http://archive.apache.org/dist/%(name)s/source/']
+
+java = 'Java'
+javaver = '1.7.0_75'
+versionsuffix = '-%s-%s' % (java, javaver)
+
+dependencies = [(java, javaver)]
+
+builddependencies = [('JUnit', '4.11', versionsuffix)]
+
+sanity_check_paths = {
+    'files': ['bin/ant', 'lib/ant.jar', 'lib/ant.jar'],
+    'dirs': [],
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/a/ant/ant-1.9.6-Java-1.7.0_80.eb b/easybuild/easyconfigs/a/ant/ant-1.9.6-Java-1.7.0_80.eb
new file mode 100644
index 0000000000000000000000000000000000000000..d93ecdb14ed240d4746ce39b63527dfa86ffc607
--- /dev/null
+++ b/easybuild/easyconfigs/a/ant/ant-1.9.6-Java-1.7.0_80.eb
@@ -0,0 +1,23 @@
+name = 'ant'
+version = '1.9.6'
+versionsuffix = '-Java-%(javaver)s'
+
+homepage = 'http://ant.apache.org/'
+description = """Apache Ant is a Java library and command-line tool whose mission is to drive processes described in build files
+ as targets and extension points dependent upon each other. The main known usage of Ant is the build of Java applications."""
+
+toolchain = {'name': 'dummy', 'version': ''}
+
+sources = ['apache-%(name)s-%(version)s-src.tar.gz']
+source_urls = ['http://archive.apache.org/dist/%(name)s/source/']
+
+dependencies = [('Java', '1.7.0_80')]
+
+builddependencies = [('JUnit', '4.12', versionsuffix)]
+
+sanity_check_paths = {
+    'files': ['bin/ant', 'lib/ant.jar', 'lib/ant.jar'],
+    'dirs': [],
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/a/argtable/argtable-2.13-goolf-1.4.10.eb b/easybuild/easyconfigs/a/argtable/argtable-2.13-goolf-1.4.10.eb
index d2502b1343169c9db267c20fd492048a698f3fee..5b65e6e0a5640ebdda8afe96bc4da40144450b59 100644
--- a/easybuild/easyconfigs/a/argtable/argtable-2.13-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/a/argtable/argtable-2.13-goolf-1.4.10.eb
@@ -15,7 +15,7 @@ description = """ Argtable is an ANSI C library for parsing GNU style
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 
 source_urls = [SOURCEFORGE_SOURCE]
-sources = ['%s%s.tar.gz' % (name, version.replace('.','-'))]
+sources = ['%s%s.tar.gz' % (name, version.replace('.', '-'))]
 
 sanity_check_paths = {
     'files': ['lib/libargtable2.%s' % SHLIB_EXT, 'lib/libargtable2.la'],
diff --git a/easybuild/easyconfigs/a/aria2/aria2-1.15.1-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/a/aria2/aria2-1.15.1-goalf-1.1.0-no-OFED.eb
index ebcf12ae1b367b5c015ff8042c4810b65b648be4..118bf6fc3bbe22ff7a175e36d01eb96d6ede446d 100644
--- a/easybuild/easyconfigs/a/aria2/aria2-1.15.1-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/a/aria2/aria2-1.15.1-goalf-1.1.0-no-OFED.eb
@@ -21,8 +21,8 @@ source_urls = ['http://sourceforge.net/projects/aria2/files', 'download']
 toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
 
 sanity_check_paths = {
-                      'files': ['bin/aria2c'],
-                      'dirs': []
-                     }
+    'files': ['bin/aria2c'],
+    'dirs': []
+}
 
 moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/a/aria2/aria2-1.15.1-goolf-1.4.10.eb b/easybuild/easyconfigs/a/aria2/aria2-1.15.1-goolf-1.4.10.eb
index cb532e1ea26f7438a0974311b1e23867c19dd050..7d1302187b153ff24defb6204cf436805af2045f 100644
--- a/easybuild/easyconfigs/a/aria2/aria2-1.15.1-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/a/aria2/aria2-1.15.1-goolf-1.4.10.eb
@@ -21,8 +21,8 @@ source_urls = ['http://sourceforge.net/projects/aria2/files', 'download']
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 
 sanity_check_paths = {
-                      'files': ['bin/aria2c'],
-                      'dirs': []
-                     }
+    'files': ['bin/aria2c'],
+    'dirs': []
+}
 
 moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/a/aria2/aria2-1.15.1-ictce-4.0.6.eb b/easybuild/easyconfigs/a/aria2/aria2-1.15.1-ictce-4.0.6.eb
index 1e9c1ad9809be91fef4739a3fa54858e4b755bd2..b6ba853506480a96264b65f9cee56e873072a4c6 100644
--- a/easybuild/easyconfigs/a/aria2/aria2-1.15.1-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/a/aria2/aria2-1.15.1-ictce-4.0.6.eb
@@ -21,8 +21,8 @@ source_urls = ['http://sourceforge.net/projects/aria2/files', 'download']
 toolchain = {'version': '4.0.6', 'name': 'ictce'}
 
 sanity_check_paths = {
-                      'files': ['bin/aria2c'],
-                      'dirs': []
-                     }
+    'files': ['bin/aria2c'],
+    'dirs': []
+}
 
 moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/a/aria2/aria2-1.15.1-ictce-5.3.0.eb b/easybuild/easyconfigs/a/aria2/aria2-1.15.1-ictce-5.3.0.eb
index 3da57c79d8b016f4d12f364bccc9c278f8a08665..f4d08974f2d550025d7bd5c2d3cb1513dfe36cf1 100644
--- a/easybuild/easyconfigs/a/aria2/aria2-1.15.1-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/a/aria2/aria2-1.15.1-ictce-5.3.0.eb
@@ -22,8 +22,8 @@ source_urls = ['http://sourceforge.net/projects/aria2/files', 'download']
 toolchain = {'name': 'ictce', 'version': '5.3.0'}
 
 sanity_check_paths = {
-                      'files': ['bin/aria2c'],
-                      'dirs': []
-                     }
+    'files': ['bin/aria2c'],
+    'dirs': []
+}
 
 moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.3.0-intel-2016a.eb b/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.3.0-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..a242bc1b1ee37041db2b04208117c2c29f0d3830
--- /dev/null
+++ b/easybuild/easyconfigs/a/arpack-ng/arpack-ng-3.3.0-intel-2016a.eb
@@ -0,0 +1,25 @@
+easyblock = 'ConfigureMake'
+
+name = 'arpack-ng'
+version = '3.3.0'
+
+homepage = 'http://forge.scilab.org/index.php/p/arpack-ng/'
+description = """ARPACK is a collection of Fortran77 subroutines designed to solve large scale eigenvalue problems."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+toolchainopts = {'opt': True, 'pic': True, 'usempi': True}
+
+source_urls = ['https://github.com/opencollab/arpack-ng/archive/']
+sources = ['%(version)s.tar.gz']
+
+builddependencies = [('Autotools', '20150215', '', ('GCC', '4.9.3-2.25'))]
+
+preconfigopts = "sh bootstrap && "
+configopts = '--with-pic --with-blas="$LIBBLAS" --with-lapack="$LIBLAPACK"'
+
+sanity_check_paths = {
+    'files': ["lib/libarpack.a", "lib/libarpack.so"],
+    'dirs': []
+}
+
+moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/b/BEDOPS/BEDOPS-2.4.2-GCC-4.8.2.eb b/easybuild/easyconfigs/b/BEDOPS/BEDOPS-2.4.2-GCC-4.8.2.eb
index 6e29870586aac648bc692d1ded8e9ef18b311557..ffd5f8b8e630d465071f385dd7dacc1b5d84c3ad 100644
--- a/easybuild/easyconfigs/b/BEDOPS/BEDOPS-2.4.2-GCC-4.8.2.eb
+++ b/easybuild/easyconfigs/b/BEDOPS/BEDOPS-2.4.2-GCC-4.8.2.eb
@@ -28,9 +28,9 @@ parallel = 1
 files_to_copy = ["bin"]
 
 sanity_check_paths = {
-    'files': ["bin/%s" % x for x in ["bedmap", "bam2bed" , "sort-bed",
-                                    "starchcat", "vcf2bed", "wig2bed",
-                                    "gtf2bed", "bedops", "wig2bed"]],
+    'files': ["bin/%s" % x for x in ["bedmap", "bam2bed", "sort-bed",
+                                     "starchcat", "vcf2bed", "wig2bed",
+                                     "gtf2bed", "bedops", "wig2bed"]],
     'dirs': []
 }
 
diff --git a/easybuild/easyconfigs/b/BEDTools/BEDTools-2.17.0-goolf-1.4.10.eb b/easybuild/easyconfigs/b/BEDTools/BEDTools-2.17.0-goolf-1.4.10.eb
index ba457aaa3a2497fe367847eaa6482cce94c2f8cd..0c8d3ca6a1c24e169e90088e936eb6fd8cde1545 100644
--- a/easybuild/easyconfigs/b/BEDTools/BEDTools-2.17.0-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/b/BEDTools/BEDTools-2.17.0-goolf-1.4.10.eb
@@ -18,7 +18,7 @@ buildopts = 'CXX="$CXX"'
 files_to_copy = ['bin', 'docs', 'data', 'genomes', 'scripts', 'test', 'README.rst']
 
 sanity_check_paths = {
-    'files': ['bin/%s' % x for x in ['bedtools', 'pairToBed', 'mergeBed','bedToBam','fastaFromBed']],
+    'files': ['bin/%s' % x for x in ['bedtools', 'pairToBed', 'mergeBed', 'bedToBam', 'fastaFromBed']],
     'dirs': ['docs', 'data', 'genomes', 'scripts', 'test'],
 }
 
diff --git a/easybuild/easyconfigs/b/BEDTools/BEDTools-2.17.0-ictce-4.1.13.eb b/easybuild/easyconfigs/b/BEDTools/BEDTools-2.17.0-ictce-4.1.13.eb
index e21399a89778f1d48d675b852cb750917a69690d..dc8e5c74f17b53a318c87ca83861bc6d5e5e9331 100644
--- a/easybuild/easyconfigs/b/BEDTools/BEDTools-2.17.0-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/b/BEDTools/BEDTools-2.17.0-ictce-4.1.13.eb
@@ -18,7 +18,7 @@ buildopts = 'CXX="$CXX"'
 files_to_copy = ['bin', 'docs', 'data', 'genomes', 'scripts', 'test', 'README.rst']
 
 sanity_check_paths = {
-    'files': ['bin/%s' % x for x in ['bedtools', 'pairToBed', 'mergeBed','bedToBam','fastaFromBed']],
+    'files': ['bin/%s' % x for x in ['bedtools', 'pairToBed', 'mergeBed', 'bedToBam', 'fastaFromBed']],
     'dirs': ['docs', 'data', 'genomes', 'scripts', 'test'],
 }
 
diff --git a/easybuild/easyconfigs/b/BEDTools/BEDTools-2.18.1-goolf-1.4.10.eb b/easybuild/easyconfigs/b/BEDTools/BEDTools-2.18.1-goolf-1.4.10.eb
index 3d93f1ffe1d2274c17d70f02736e23cba4eb1d6b..f0c69050e7172bbf95f628aa68bb35b996ec7b5d 100644
--- a/easybuild/easyconfigs/b/BEDTools/BEDTools-2.18.1-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/b/BEDTools/BEDTools-2.18.1-goolf-1.4.10.eb
@@ -22,7 +22,7 @@ buildopts = 'CXX="$CXX"'
 files_to_copy = ['bin', 'docs', 'data', 'genomes', 'scripts', 'test', 'README.rst']
 
 sanity_check_paths = {
-    'files': ['bin/%s' % x for x in ['bedtools', 'pairToBed', 'mergeBed','bedToBam','fastaFromBed']],
+    'files': ['bin/%s' % x for x in ['bedtools', 'pairToBed', 'mergeBed', 'bedToBam', 'fastaFromBed']],
     'dirs': ['docs', 'data', 'genomes', 'scripts', 'test'],
 }
 
diff --git a/easybuild/easyconfigs/b/BEDTools/BEDTools-2.19.1-goolf-1.4.10.eb b/easybuild/easyconfigs/b/BEDTools/BEDTools-2.19.1-goolf-1.4.10.eb
index 28fd6859e074655c61a21053f7b45c8fd258baf4..f644a6657686c114296cc4b0e172b955c808334d 100644
--- a/easybuild/easyconfigs/b/BEDTools/BEDTools-2.19.1-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/b/BEDTools/BEDTools-2.19.1-goolf-1.4.10.eb
@@ -20,7 +20,7 @@ sources = ['v%(version)s.tar.gz']
 files_to_copy = ['bin', 'docs', 'data', 'genomes', 'scripts', 'test', 'README.md']
 
 sanity_check_paths = {
-    'files': ['bin/%s' % x for x in ['bedtools', 'pairToBed', 'mergeBed','bedToBam','fastaFromBed']],
+    'files': ['bin/%s' % x for x in ['bedtools', 'pairToBed', 'mergeBed', 'bedToBam', 'fastaFromBed']],
     'dirs': ['docs', 'data', 'genomes', 'scripts', 'test'],
 }
 
diff --git a/easybuild/easyconfigs/b/BEDTools/BEDTools-2.22.0-intel-2014b.eb b/easybuild/easyconfigs/b/BEDTools/BEDTools-2.22.0-intel-2014b.eb
index 92af179960d7019463ee8751221e55596cf353e3..7133a6b8a4cbc30a5a1540b90ea498d7d7bbc594 100644
--- a/easybuild/easyconfigs/b/BEDTools/BEDTools-2.22.0-intel-2014b.eb
+++ b/easybuild/easyconfigs/b/BEDTools/BEDTools-2.22.0-intel-2014b.eb
@@ -22,7 +22,7 @@ buildopts = 'CXX="$CXX"'
 files_to_copy = ['bin', 'docs', 'data', 'genomes', 'scripts', 'test', 'README.md']
 
 sanity_check_paths = {
-    'files': ['bin/%s' % x for x in ['bedtools', 'pairToBed', 'mergeBed','bedToBam','fastaFromBed']],
+    'files': ['bin/%s' % x for x in ['bedtools', 'pairToBed', 'mergeBed', 'bedToBam', 'fastaFromBed']],
     'dirs': ['docs', 'data', 'genomes', 'scripts', 'test'],
 }
 
diff --git a/easybuild/easyconfigs/b/BEDTools/BEDTools-2.23.0-goolf-1.4.10.eb b/easybuild/easyconfigs/b/BEDTools/BEDTools-2.23.0-goolf-1.4.10.eb
index 24939845945a33692ef1046ef7df7e89fa22222f..2f9e862e72a8f0d18800672274c85c8e163ad7b4 100644
--- a/easybuild/easyconfigs/b/BEDTools/BEDTools-2.23.0-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/b/BEDTools/BEDTools-2.23.0-goolf-1.4.10.eb
@@ -25,7 +25,7 @@ buildopts = 'CXX="$CXX"'
 files_to_copy = ["bin", "docs", "data", "genomes", "scripts", "test"]
 
 sanity_check_paths = {
-    'files': ['bin/%s' % x for x in ['bedtools', 'pairToBed', 'mergeBed','bedToBam','fastaFromBed']],
+    'files': ['bin/%s' % x for x in ['bedtools', 'pairToBed', 'mergeBed', 'bedToBam', 'fastaFromBed']],
     'dirs': files_to_copy,
 }
 
diff --git a/easybuild/easyconfigs/b/BEDTools/BEDTools-2.23.0-intel-2015a.eb b/easybuild/easyconfigs/b/BEDTools/BEDTools-2.23.0-intel-2015a.eb
index 6160ea742195a0232e6c6884074a6c8bfc8f2ce8..185d7a2d1a9635241f1822b32c67aeeace26191e 100644
--- a/easybuild/easyconfigs/b/BEDTools/BEDTools-2.23.0-intel-2015a.eb
+++ b/easybuild/easyconfigs/b/BEDTools/BEDTools-2.23.0-intel-2015a.eb
@@ -22,7 +22,7 @@ buildopts = 'CXX="$CXX"'
 files_to_copy = ['bin', 'docs', 'data', 'genomes', 'scripts', 'test', 'tutorial', 'README.md']
 
 sanity_check_paths = {
-    'files': ['bin/%s' % x for x in ['bedtools', 'pairToBed', 'mergeBed','bedToBam','fastaFromBed']],
+    'files': ['bin/%s' % x for x in ['bedtools', 'pairToBed', 'mergeBed', 'bedToBam', 'fastaFromBed']],
     'dirs': ['docs', 'data', 'genomes', 'scripts', 'test', 'tutorial'],
 }
 
diff --git a/easybuild/easyconfigs/b/BEDTools/BEDTools-2.25.0-foss-2015a.eb b/easybuild/easyconfigs/b/BEDTools/BEDTools-2.25.0-foss-2015a.eb
index 6997e33823324a241550862f20e3293973d4e3c3..bcb3a9de52f027de6104eca8fa68271743448971 100644
--- a/easybuild/easyconfigs/b/BEDTools/BEDTools-2.25.0-foss-2015a.eb
+++ b/easybuild/easyconfigs/b/BEDTools/BEDTools-2.25.0-foss-2015a.eb
@@ -26,7 +26,7 @@ buildopts = 'CXX="$CXX"'
 files_to_copy = ["bin", "docs", "data", "genomes", "scripts", "test"]
 
 sanity_check_paths = {
-    'files': ['bin/%s' % x for x in ['bedtools', 'pairToBed', 'mergeBed','bedToBam','fastaFromBed']],
+    'files': ['bin/%s' % x for x in ['bedtools', 'pairToBed', 'mergeBed', 'bedToBam', 'fastaFromBed']],
     'dirs': files_to_copy,
 }
 
diff --git a/easybuild/easyconfigs/b/BEDTools/BEDTools-2.25.0-goolf-1.7.20.eb b/easybuild/easyconfigs/b/BEDTools/BEDTools-2.25.0-goolf-1.7.20.eb
index 3e92e220597c70b127eebd2bfd35c947a8ae558b..a4e3ce1eb7b51f517f308c80d4673dfdc22e66ee 100644
--- a/easybuild/easyconfigs/b/BEDTools/BEDTools-2.25.0-goolf-1.7.20.eb
+++ b/easybuild/easyconfigs/b/BEDTools/BEDTools-2.25.0-goolf-1.7.20.eb
@@ -26,7 +26,7 @@ buildopts = 'CXX="$CXX"'
 files_to_copy = ["bin", "docs", "data", "genomes", "scripts", "test"]
 
 sanity_check_paths = {
-    'files': ['bin/%s' % x for x in ['bedtools', 'pairToBed', 'mergeBed','bedToBam','fastaFromBed']],
+    'files': ['bin/%s' % x for x in ['bedtools', 'pairToBed', 'mergeBed', 'bedToBam', 'fastaFromBed']],
     'dirs': files_to_copy,
 }
 
diff --git a/easybuild/easyconfigs/b/BFAST/BFAST-0.7.0a-goolf-1.7.20.eb b/easybuild/easyconfigs/b/BFAST/BFAST-0.7.0a-goolf-1.7.20.eb
new file mode 100644
index 0000000000000000000000000000000000000000..a5c3af2f9a7bd3ce2ede0ede475c0da9fe1246f0
--- /dev/null
+++ b/easybuild/easyconfigs/b/BFAST/BFAST-0.7.0a-goolf-1.7.20.eb
@@ -0,0 +1,40 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2012-2014 Uni.Lu/LCSB, NTUA
+# Authors::   Fotis Georgatos <fotis@cern.ch>
+# License::   MIT/GPL
+# $Id$
+#
+# This work implements a part of the HPCBIOS project and is a component of the policy:
+# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-94.html
+##
+
+easyblock = 'ConfigureMake'
+
+name = 'BFAST'
+version = '0.7.0a'
+
+homepage = 'http://bfast.sourceforge.net/'
+description = """BFAST facilitates the fast and accurate mapping of short reads to reference sequences.
+ Some advantages of BFAST include:
+ 1) Speed: enables billions of short reads to be mapped quickly. 
+ 2) Accuracy: A priori probabilities for mapping reads with defined set of variants. 
+ 3) An easy way to measurably tune accuracy at the expense of speed."""
+
+toolchain = {'name': 'goolf', 'version': '1.7.20'}
+
+import string
+swdir = version.rstrip(string.lowercase + string.uppercase)
+# eg. http://sourceforge.net/projects/bfast/files/bfast/0.7.0/bfast-0.7.0a.tar.gz/download
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://sourceforge.net/projects/bfast/files/bfast/%s/' % swdir, 'download']
+
+dependencies = [('bzip2', '1.0.6')]
+
+sanity_check_paths = {
+    'files': ["bin/bfast"],
+    'dirs': [],
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/b/BH/BH-1.60.0-1-foss-2015b-R-3.2.3.eb b/easybuild/easyconfigs/b/BH/BH-1.60.0-1-foss-2015b-R-3.2.3.eb
new file mode 100644
index 0000000000000000000000000000000000000000..16cdd37dda616f97ff392987766e98f595458ea2
--- /dev/null
+++ b/easybuild/easyconfigs/b/BH/BH-1.60.0-1-foss-2015b-R-3.2.3.eb
@@ -0,0 +1,36 @@
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Author: Adam Huffman <adam.huffman@crick.ac.uk>
+# The Francis Crick Institute
+
+easyblock = 'RPackage'
+
+name = 'BH'
+version = '1.60.0-1'
+
+homepage = 'http://cran.r-project.org/web/packages/%(name)s'
+description = """BH: Boost C++ Header Files for R"""
+
+toolchain = {'name': 'foss', 'version': '2015b'}
+
+source_urls = [
+    'http://cran.r-project.org/src/contrib/',
+    'http://cran.r-project.org/src/contrib/Archive/$(name)s/',
+]
+sources = ['%(name)s_%(version)s.tar.gz']
+
+r = 'R'
+rver = '3.2.3'
+versionsuffix = '-%s-%s' % (r, rver)
+
+dependencies = [
+    (r, rver),
+    ('Boost', '1.60.0'),
+]
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['BH'],
+}
+
+moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/b/BLAST+/BLAST+-2.2.27-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/b/BLAST+/BLAST+-2.2.27-goalf-1.1.0-no-OFED.eb
index 8129083a064d320a0e7ec6dc1b8a21dcea6964b1..3d76340994583f9b78c44d794b5f1d780a35a901 100644
--- a/easybuild/easyconfigs/b/BLAST+/BLAST+-2.2.27-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/b/BLAST+/BLAST+-2.2.27-goalf-1.1.0-no-OFED.eb
@@ -30,8 +30,8 @@ dependencies = [('Boost', '1.51.0')]
 configopts = '--with-boost=$EBROOTBOOST --with-64 --with-bin-release --without-debug --with-mt'
 
 sanity_check_paths = {
-                      'files': ["bin/blastn", "bin/blastp", "bin/blastx"],
-                      'dirs': []
-                     }
+    'files': ["bin/blastn", "bin/blastp", "bin/blastx"],
+    'dirs': []
+}
 
 moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/b/BLAST+/BLAST+-2.2.27-goolf-1.4.10.eb b/easybuild/easyconfigs/b/BLAST+/BLAST+-2.2.27-goolf-1.4.10.eb
index e7772ac7282bd2f4381ffee810fe41375082acc6..d441a3b6be2182b42bc4614298b588eb2f11202e 100644
--- a/easybuild/easyconfigs/b/BLAST+/BLAST+-2.2.27-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/b/BLAST+/BLAST+-2.2.27-goolf-1.4.10.eb
@@ -30,8 +30,8 @@ dependencies = [('Boost', '1.51.0')]
 configopts = '--with-boost=$EBROOTBOOST --with-64 --with-bin-release --without-debug --with-mt'
 
 sanity_check_paths = {
-                      'files': ["bin/blastn", "bin/blastp", "bin/blastx"],
-                      'dirs': []
-                     }
+    'files': ["bin/blastn", "bin/blastp", "bin/blastx"],
+    'dirs': []
+}
 
 moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/b/BLAST+/BLAST+-2.2.27-ictce-4.0.6.eb b/easybuild/easyconfigs/b/BLAST+/BLAST+-2.2.27-ictce-4.0.6.eb
index 3800356ed9249faa0e893116157e57a2444ed54e..5d3bf8464428aa448b88fdb7b886ee05598ef69e 100644
--- a/easybuild/easyconfigs/b/BLAST+/BLAST+-2.2.27-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/b/BLAST+/BLAST+-2.2.27-ictce-4.0.6.eb
@@ -32,8 +32,8 @@ dependencies = [('Boost', '1.51.0')]
 configopts = '--with-boost=$EBROOTBOOST --with-64 --with-bin-release --without-debug --with-mt'
 
 sanity_check_paths = {
-                      'files': ["bin/blastn", "bin/blastp", "bin/blastx"],
-                      'dirs': []
-                     }
+    'files': ["bin/blastn", "bin/blastp", "bin/blastx"],
+    'dirs': []
+}
 
 moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/b/BLAST+/BLAST+-2.2.28-goolf-1.4.10.eb b/easybuild/easyconfigs/b/BLAST+/BLAST+-2.2.28-goolf-1.4.10.eb
index d52c0aba661b1b97e2c9f6db82e1c409f505e5d8..0da49b06b6fc190d2330b2df278cd22bf82912e7 100644
--- a/easybuild/easyconfigs/b/BLAST+/BLAST+-2.2.28-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/b/BLAST+/BLAST+-2.2.28-goolf-1.4.10.eb
@@ -30,8 +30,8 @@ dependencies = [('Boost', '1.51.0')]
 configopts = '--with-boost=$EBROOTBOOST --with-64 --with-bin-release --without-debug --with-mt'
 
 sanity_check_paths = {
-                      'files': ["bin/blastn", "bin/blastp", "bin/blastx"],
-                      'dirs': []
-                     }
+    'files': ["bin/blastn", "bin/blastp", "bin/blastx"],
+    'dirs': []
+}
 
 moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/b/BLAST+/BLAST+-2.2.28-ictce-4.1.13.eb b/easybuild/easyconfigs/b/BLAST+/BLAST+-2.2.28-ictce-4.1.13.eb
index adcf957193c7c994e6fae70f3517e29b6ccdfec8..9a1f3c026948fd633558c646d9126c741eae66f6 100644
--- a/easybuild/easyconfigs/b/BLAST+/BLAST+-2.2.28-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/b/BLAST+/BLAST+-2.2.28-ictce-4.1.13.eb
@@ -32,8 +32,8 @@ dependencies = [('Boost', '1.51.0')]
 configopts = '--with-boost=$EBROOTBOOST --with-64 --with-bin-release --without-debug --with-mt'
 
 sanity_check_paths = {
-                      'files': ["bin/blastn", "bin/blastp", "bin/blastx"],
-                      'dirs': []
-                     }
+    'files': ["bin/blastn", "bin/blastp", "bin/blastx"],
+    'dirs': []
+}
 
 moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/b/BLAST+/BLAST+-2.2.30-foss-2015a-Python-2.7.9.eb b/easybuild/easyconfigs/b/BLAST+/BLAST+-2.2.30-foss-2015a-Python-2.7.9.eb
index 37178f8aa58e052452669f9684430d441e5d8e1b..8c97b6b7aa34984d31b4bb6a59d7eba05e5d3f4c 100644
--- a/easybuild/easyconfigs/b/BLAST+/BLAST+-2.2.30-foss-2015a-Python-2.7.9.eb
+++ b/easybuild/easyconfigs/b/BLAST+/BLAST+-2.2.30-foss-2015a-Python-2.7.9.eb
@@ -38,4 +38,3 @@ sanity_check_paths = {
 }
 
 moduleclass = 'bio'
-
diff --git a/easybuild/easyconfigs/b/BLAST+/BLAST+-2.2.30-goolf-1.4.10.eb b/easybuild/easyconfigs/b/BLAST+/BLAST+-2.2.30-goolf-1.4.10.eb
index 505c849588b88ff2df569d36eee39444a26c2926..5daf7c4b33652f1117e651bd5450395954047855 100644
--- a/easybuild/easyconfigs/b/BLAST+/BLAST+-2.2.30-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/b/BLAST+/BLAST+-2.2.30-goolf-1.4.10.eb
@@ -37,4 +37,3 @@ sanity_check_paths = {
 }
 
 moduleclass = 'bio'
-
diff --git a/easybuild/easyconfigs/b/BLAST/BLAST-2.2.26-Linux_x86_64.eb b/easybuild/easyconfigs/b/BLAST/BLAST-2.2.26-Linux_x86_64.eb
index 7b97564a4d72ced37ae0457b52eddf821d106413..22babb46e9e36ae27d48862030dd750426baad55 100644
--- a/easybuild/easyconfigs/b/BLAST/BLAST-2.2.26-Linux_x86_64.eb
+++ b/easybuild/easyconfigs/b/BLAST/BLAST-2.2.26-Linux_x86_64.eb
@@ -20,7 +20,7 @@ source_urls = ['http://ftp.ncbi.nlm.nih.gov/blast/executables/release/%(version)
 sources = ['%(namelower)s-%(version)s-x64-linux.tar.gz']
 
 sanity_check_paths = {
-    'files': ["bin/blastall", "bin/impala", "bin/blastpgp" ],
+    'files': ["bin/blastall", "bin/impala", "bin/blastpgp"],
     'dirs': []
 }
 
diff --git a/easybuild/easyconfigs/b/BOINC/BOINC-7.0.65-goolf-1.4.10-client.eb b/easybuild/easyconfigs/b/BOINC/BOINC-7.0.65-goolf-1.4.10-client.eb
index ba1d06a7ffe10b84715c2d2f842afc0d19b58c9d..38d7535bfad1700adcda76c5019bb52d208dc271 100644
--- a/easybuild/easyconfigs/b/BOINC/BOINC-7.0.65-goolf-1.4.10-client.eb
+++ b/easybuild/easyconfigs/b/BOINC/BOINC-7.0.65-goolf-1.4.10-client.eb
@@ -16,8 +16,8 @@ toolchain = {'name': 'goolf', 'version': '1.4.10'}
 sources = [SOURCELOWER_TAR_BZ2]
 
 dependencies = [
-    ('OpenSSL','1.0.1f'),
-    ('cURL','7.29.0'),
+    ('OpenSSL', '1.0.1f'),
+    ('cURL', '7.29.0'),
 ]
 
 with_configure = True
@@ -29,9 +29,8 @@ files_to_copy = [(['client/boin*[cd]'], 'bin')]
 
 # make sure the binary are available after installation
 sanity_check_paths = {
-    'files': ["bin/boinc", "bin/boinccmd"],
+    'files': ['bin/boinc', 'bin/boinccmd'],
     'dirs': [],
 }
 
 moduleclass = 'tools'
-
diff --git a/easybuild/easyconfigs/b/BOINC/BOINC-7.2.42-GCC-4.8.2-client.eb b/easybuild/easyconfigs/b/BOINC/BOINC-7.2.42-GCC-4.8.2-client.eb
index 599b616ab9f4639c8a82e2021dc59c236d688fa4..be4ba09c0d868003c7336319b3ab65970b8fa071 100644
--- a/easybuild/easyconfigs/b/BOINC/BOINC-7.2.42-GCC-4.8.2-client.eb
+++ b/easybuild/easyconfigs/b/BOINC/BOINC-7.2.42-GCC-4.8.2-client.eb
@@ -16,17 +16,17 @@ toolchain = {'name': 'GCC', 'version': '4.8.2'}
 sources = [SOURCELOWER_TAR_BZ2]
 
 dependencies = [
-    ('OpenSSL','1.0.1f'),
-    ('cURL','7.34.0'),
+    ('OpenSSL', '1.0.1f'),
+    ('cURL', '7.34.0'),
 ]
 
 builddependencies = [
-    ('libtool','2.4.2'),
-    ('make','3.82'),
-    ('pkg-config','0.28'),
-    ('M4','1.4.16'),
-    ('Autoconf','2.69'),
-    ('Automake','1.14.1')
+    ('libtool', '2.4.2'),
+    ('make', '3.82'),
+    ('pkg-config', '0.28'),
+    ('M4', '1.4.16'),
+    ('Autoconf', '2.69'),
+    ('Automake', '1.14.1')
 ]
 
 prebuildopts = "./_autosetup && ./configure --disable-server --disable-manager --enable-client &&"
@@ -35,9 +35,8 @@ files_to_copy = [(['client/boinc', 'client/boinccmd'], 'bin')]
 
 # make sure the binary are available after installation
 sanity_check_paths = {
-    'files': ["bin/boinc",],
+    'files': ['bin/boinc'],
     'dirs': [],
 }
 
 moduleclass = 'tools'
-
diff --git a/easybuild/easyconfigs/b/BOINC/BOINC-7.2.42-ictce-5.5.0-client.eb b/easybuild/easyconfigs/b/BOINC/BOINC-7.2.42-ictce-5.5.0-client.eb
index bc81b334dec4c3bdcc913b7c81d7d91bccc4ba5d..66f39d890d91e8b3fa0f762c3feaecce76e54004 100644
--- a/easybuild/easyconfigs/b/BOINC/BOINC-7.2.42-ictce-5.5.0-client.eb
+++ b/easybuild/easyconfigs/b/BOINC/BOINC-7.2.42-ictce-5.5.0-client.eb
@@ -16,17 +16,17 @@ toolchain = {'name': 'ictce', 'version': '5.5.0'}
 sources = [SOURCELOWER_TAR_BZ2]
 
 dependencies = [
-    ('OpenSSL','1.0.1f'),
-    ('cURL','7.34.0'),
+    ('OpenSSL', '1.0.1f'),
+    ('cURL', '7.34.0'),
 ]
 
 builddependencies = [
-    ('libtool','2.4.2'),
-    ('make','3.82'),
-    ('pkg-config','0.28'),
-    ('M4','1.4.16'),
-    ('Autoconf','2.69'),
-    ('Automake','1.14')
+    ('libtool', '2.4.2'),
+    ('make', '3.82'),
+    ('pkg-config', '0.28'),
+    ('M4', '1.4.16'),
+    ('Autoconf', '2.69'),
+    ('Automake', '1.14')
 ]
 
 prebuildopts = "./_autosetup && ./configure --disable-server --disable-manager --enable-client &&"
@@ -35,9 +35,8 @@ files_to_copy = [(['client/boinc', 'client/boinccmd'], 'bin')]
 
 # make sure the binary are available after installation
 sanity_check_paths = {
-    'files': ["bin/boinc",],
+    'files': ['bin/boinc'],
     'dirs': [],
 }
 
 moduleclass = 'tools'
-
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 d31fc0a136ae9c6e041c39b76beaad97047cc9f2..400f14ed066ca6912f8c3c42780b7477ae1185fc 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
@@ -16,20 +16,20 @@ skipsteps = ['configure']
 installopts = "DESTDIR=%(installdir)s"
 
 patches = [
-     'BSMAP-2.74_makefile-modif.patch',
-     'BSMAP-2.74_parameters-cpp.patch',
-     'BSMAP-2.74_samtools-deps.patch',
+    'BSMAP-2.74_makefile-modif.patch',
+    'BSMAP-2.74_parameters-cpp.patch',
+    'BSMAP-2.74_samtools-deps.patch',
 ]
 
 dependencies = [
-     ('ncurses', '5.9'),
-     ('zlib', '1.2.7'),
-     ('SAMtools', '0.1.18'),
+    ('ncurses', '5.9'),
+    ('zlib', '1.2.7'),
+    ('SAMtools', '0.1.18'),
 ]
 
 sanity_check_paths = {
-     'files': ["bin/%s" % x for x in ["bsmap", "methratio.py", "sam2bam.sh"]],
-     'dirs': [],
+    'files': ["bin/%s" % x for x in ["bsmap", "methratio.py", "sam2bam.sh"]],
+    'dirs': [],
 }
 
 moduleclass = 'data'
diff --git a/easybuild/easyconfigs/b/BamTools/BamTools-2.4.0-foss-2015b.eb b/easybuild/easyconfigs/b/BamTools/BamTools-2.4.0-foss-2015b.eb
index c4a843674ba89042d1157afff8b9102aeb1685b0..9e9c2961a5d7adfaf53fe8f3df774c7fdda630a9 100644
--- a/easybuild/easyconfigs/b/BamTools/BamTools-2.4.0-foss-2015b.eb
+++ b/easybuild/easyconfigs/b/BamTools/BamTools-2.4.0-foss-2015b.eb
@@ -22,7 +22,7 @@ builddependencies = [('CMake', '3.4.1')]
 
 files_to_copy = ["bin", "lib", "include", "docs", "LICENSE", "README"]
 
-sanity_check_paths =  {
+sanity_check_paths = {
     'files': ["bin/bamtools", "include/shared/bamtools_global.h", "lib/libbamtools.a",
               "lib/libbamtools.so", "lib/libbamtools-utils.a", "lib/libjsoncpp.a"],
     'dirs': ["include/api", "docs"]
diff --git a/easybuild/easyconfigs/b/Bash/Bash-4.2-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/b/Bash/Bash-4.2-goalf-1.1.0-no-OFED.eb
index b2a23aa149ae6262433599eda1a963b289b30210..57dbb97a1af7ad0a50b87d22e58407d6b7a4a499 100644
--- a/easybuild/easyconfigs/b/Bash/Bash-4.2-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/b/Bash/Bash-4.2-goalf-1.1.0-no-OFED.eb
@@ -20,7 +20,7 @@ description = """Bash is an sh-compatible command language interpreter that exec
  read from the standard input or from a file.  Bash also incorporates useful features from the 
  Korn and C shells (ksh and csh)."""
 
-toolchain = {'name' : 'goalf', 'version' : '1.1.0-no-OFED'}
+toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
 
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = [GNU_SOURCE]
diff --git a/easybuild/easyconfigs/b/Bash/Bash-4.3-GCC-4.9.2.eb b/easybuild/easyconfigs/b/Bash/Bash-4.3-GCC-4.9.2.eb
index d02188852b0208b1ca1e0a5274210ecfbbef37c1..3d11d3fad48d25103469214b3876c5759bbe9e7e 100644
--- a/easybuild/easyconfigs/b/Bash/Bash-4.3-GCC-4.9.2.eb
+++ b/easybuild/easyconfigs/b/Bash/Bash-4.3-GCC-4.9.2.eb
@@ -1,13 +1,13 @@
 ##
-## This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
 ##
-## Copyright:: Copyright 2012-2013 University of Luxembourg/Computer Science and Communications Research Unit
-## Authors::   Valentin Plugaru <valentin.plugaru@gmail.com>
-## License::   MIT/GPL
-## $Id$
+# Copyright:: Copyright 2012-2013 University of Luxembourg/Computer Science and Communications Research Unit
+# Authors::   Valentin Plugaru <valentin.plugaru@gmail.com>
+# License::   MIT/GPL
+# $Id$
 ##
-## This work implements a part of the HPCBIOS project and is a component of the policy:
-## http://hpcbios.readthedocs.org/en/latest/HPCBIOS_05-06.html
+# This work implements a part of the HPCBIOS project and is a component of the policy:
+# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_05-06.html
 ###
 #
 easyblock = 'ConfigureMake'
diff --git a/easybuild/easyconfigs/b/BayesTraits/BayesTraits-1.0-linux32.eb b/easybuild/easyconfigs/b/BayesTraits/BayesTraits-1.0-linux32.eb
index 49c78aa1c48b4e74c221c0c12ddc0c01416639f6..8d561cd81b9141b1690e67afb350c62768770f20 100644
--- a/easybuild/easyconfigs/b/BayesTraits/BayesTraits-1.0-linux32.eb
+++ b/easybuild/easyconfigs/b/BayesTraits/BayesTraits-1.0-linux32.eb
@@ -27,6 +27,6 @@ sanity_check_paths = {
     'dirs': [],
 }
 
-modextrapaths = {'PATH':''}
+modextrapaths = {'PATH': ''}
 
 moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/b/BayesTraits/BayesTraits-2.0-Beta-Linux64.eb b/easybuild/easyconfigs/b/BayesTraits/BayesTraits-2.0-Beta-Linux64.eb
index 159ed9b248090a70f22d206eb23991b47a78f3b5..29cb55f2519ef5648562bc4475989931f17dc654 100644
--- a/easybuild/easyconfigs/b/BayesTraits/BayesTraits-2.0-Beta-Linux64.eb
+++ b/easybuild/easyconfigs/b/BayesTraits/BayesTraits-2.0-Beta-Linux64.eb
@@ -28,6 +28,6 @@ sanity_check_paths = {
     'dirs': [],
 }
 
-modextrapaths = {'PATH':''}
+modextrapaths = {'PATH': ''}
 
 moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/b/Beast/Beast-2.1.3.eb b/easybuild/easyconfigs/b/Beast/Beast-2.1.3.eb
index b396cebf89e962bb3e2542441303ff3edae0adac..16f5b548acef3a6efbcb5eb6ebcbd9b3549d33f9 100644
--- a/easybuild/easyconfigs/b/Beast/Beast-2.1.3.eb
+++ b/easybuild/easyconfigs/b/Beast/Beast-2.1.3.eb
@@ -25,13 +25,12 @@ dependencies = [
     # this is not mandatory but beagle-lib is recommended by developers
     # beagle-lib will also load the required java dependency
     # if you remove this you should add the java dependency
-    ('beagle-lib', '20120124', '',('goolf', '1.4.10')),
+    ('beagle-lib', '20120124', '', ('goolf', '1.4.10')),
 ]
 
 sanity_check_paths = {
-    'files': ["bin/beast" ],
+    'files': ["bin/beast"],
     'dirs': []
 }
 
 moduleclass = 'bio'
-
diff --git a/easybuild/easyconfigs/b/BioPerl/BioPerl-1.6.923-intel-2015b-Perl-5.20.3.eb b/easybuild/easyconfigs/b/BioPerl/BioPerl-1.6.923-intel-2015b-Perl-5.20.3.eb
new file mode 100644
index 0000000000000000000000000000000000000000..0b4fbe276afb57d45704be5a44aa7df3409d4c0e
--- /dev/null
+++ b/easybuild/easyconfigs/b/BioPerl/BioPerl-1.6.923-intel-2015b-Perl-5.20.3.eb
@@ -0,0 +1,23 @@
+easyblock = 'PerlModule'
+
+name = 'BioPerl'
+version = '1.6.923'
+versionsuffix = '-Perl-%(perlver)s'
+
+homepage = 'http://www.bioperl.org/'
+description = """Bioperl is the product of a community effort to produce Perl code which is useful in biology.
+ Examples include Sequence objects, Alignment objects and database searching objects."""
+
+toolchain = {'name': 'intel', 'version': '2015b'}
+
+source_urls = ['https://github.com/bioperl/bioperl-live/archive/']
+sources = ['release-%s.tar.gz' % version.replace('.', '-')]
+
+dependencies = [
+    ('Perl', '5.20.3'),
+    ('DB_File', '1.831', versionsuffix),
+]
+
+options = {'modulename': 'Bio::Perl'}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/b/BioPerl/BioPerl-1.6.924-intel-2016a-Perl-5.20.3.eb b/easybuild/easyconfigs/b/BioPerl/BioPerl-1.6.924-intel-2016a-Perl-5.20.3.eb
new file mode 100644
index 0000000000000000000000000000000000000000..4145ed2b911e0e6382205416d8fb30ce6d714acf
--- /dev/null
+++ b/easybuild/easyconfigs/b/BioPerl/BioPerl-1.6.924-intel-2016a-Perl-5.20.3.eb
@@ -0,0 +1,23 @@
+easyblock = 'PerlModule'
+
+name = 'BioPerl'
+version = '1.6.924'
+versionsuffix = '-Perl-%(perlver)s'
+
+homepage = 'http://www.bioperl.org/'
+description = """Bioperl is the product of a community effort to produce Perl code which is useful in biology.
+ Examples include Sequence objects, Alignment objects and database searching objects."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+source_urls = ['https://github.com/bioperl/bioperl-live/archive/']
+sources = ['release-%s.tar.gz' % version.replace('.', '-')]
+
+dependencies = [
+    ('Perl', '5.20.3'),
+    ('DB_File', '1.835', versionsuffix),
+]
+
+options = {'modulename': 'Bio::Perl'}
+
+moduleclass = 'bio'
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 baf247c07d375d56d0644d0a4d24b28fae42ba8b..a3dca17749044c2d2dbbcbb0b641dd26b1d1044f 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
@@ -36,9 +36,8 @@ dependencies = [
 sanity_check_paths = {
     'files': [],
     '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]
+             'lib/python%s/site-packages/biopython-%s-py%s.egg-info' % (pyshortver, version, pyshortver),
+             'lib/python%s/site-packages/BioSQL' % pyshortver]
 }
 
 options = {'modulename': 'Bio'}
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 96eae4f6355fd4035d91d0b741a609d301962072..5efa64f0e0b39bd4ac7c2fa8a4df92ab46a30d76 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
@@ -36,9 +36,8 @@ dependencies = [
 sanity_check_paths = {
     'files': [],
     '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]
+             'lib/python%s/site-packages/biopython-%s-py%s.egg-info' % (pyshortver, version, pyshortver),
+             'lib/python%s/site-packages/BioSQL' % pyshortver]
 }
 
 options = {'modulename': 'Bio'}
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 07dcfa192ddee66faf061bc591471c9cb6bfb899..ee96cc0a43c6030bc536708e453d08065a74d3aa 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
@@ -18,14 +18,14 @@ determine cytosine methylation states"""
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 
 source_urls = ["http://www.bioinformatics.babraham.ac.uk/projects/bismark/"]
-sources = ['%s_v%s.tar.gz' % (name.lower(), version) ]
+sources = ['%(namelower)s_v%(version)s.tar.gz']
 
 dependencies = [('Bowtie2', '2.0.2')]
 
 sanity_check_paths = {
-     'files': ["bismark", "bismark2bedGraph", "bismark2report", "bismark_genome_preparation",
-               "bismark_methylation_extractor", "coverage2cytosine", "deduplicate_bismark"],
-     'dirs': [],
+    '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.5-ictce-5.4.0.eb b/easybuild/easyconfigs/b/Bison/Bison-2.5-ictce-5.4.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..18dbc65289ce10574d7890ce4706c359a368c948
--- /dev/null
+++ b/easybuild/easyconfigs/b/Bison/Bison-2.5-ictce-5.4.0.eb
@@ -0,0 +1,23 @@
+easyblock = 'ConfigureMake'
+
+name = 'Bison'
+version = '2.5'
+
+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': 'ictce', 'version': '5.4.0'}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = [GNU_SOURCE]
+
+builddependencies = [('M4', '1.4.16')]
+
+sanity_check_paths = {
+    'files': ["bin/%s" % x for x in ["bison", "yacc"]] + ["lib/liby.a"],
+    'dirs': [],
+}
+
+moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/b/Bison/Bison-2.7-iccifort-2011.13.367.eb b/easybuild/easyconfigs/b/Bison/Bison-2.7-iccifort-2011.13.367.eb
index 6f79524592e59001e11c55950ecac6af08208a23..0971fbca29a3c27148b6c08b111eec70183a52f2 100644
--- a/easybuild/easyconfigs/b/Bison/Bison-2.7-iccifort-2011.13.367.eb
+++ b/easybuild/easyconfigs/b/Bison/Bison-2.7-iccifort-2011.13.367.eb
@@ -15,8 +15,8 @@ source_urls = [GNU_SOURCE]
 builddependencies = [('M4', '1.4.16')]
 
 sanity_check_paths = {
-    'files':["bin/%s" % x for x in ["bison", "yacc"]] + ["lib/liby.a"],
-    'dirs':[],
+    'files': ["bin/%s" % x for x in ["bison", "yacc"]] + ["lib/liby.a"],
+    'dirs': [],
 }
 
 moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/b/Bison/Bison-2.7-ictce-4.1.13.eb b/easybuild/easyconfigs/b/Bison/Bison-2.7-ictce-4.1.13.eb
index 1345612aec5751bfa28e80b6b940f56b3e8cc8e2..a47f4cfdd82fb53ae1968092c6c8e834b2ad1f27 100644
--- a/easybuild/easyconfigs/b/Bison/Bison-2.7-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/b/Bison/Bison-2.7-ictce-4.1.13.eb
@@ -15,8 +15,8 @@ source_urls = [GNU_SOURCE]
 builddependencies = [('M4', '1.4.16')]
 
 sanity_check_paths = {
-    'files':["bin/%s" % x for x in ["bison", "yacc"]] + ["lib/liby.a"],
-    'dirs':[],
+    'files': ["bin/%s" % x for x in ["bison", "yacc"]] + ["lib/liby.a"],
+    'dirs': [],
 }
 
 moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/b/Bison/Bison-3.0.4-foss-2015a.eb b/easybuild/easyconfigs/b/Bison/Bison-3.0.4-foss-2015a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..b4eb8b24719d72f6d2a4e7861293fb09565db2a9
--- /dev/null
+++ b/easybuild/easyconfigs/b/Bison/Bison-3.0.4-foss-2015a.eb
@@ -0,0 +1,22 @@
+easyblock = 'ConfigureMake'
+
+name = 'Bison'
+version = '3.0.4'
+
+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': 'foss', 'version': '2015a'}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = [GNU_SOURCE]
+
+builddependencies = [('M4', '1.4.17')]
+
+sanity_check_paths = {
+    'files': ["bin/%s" % x for x in ["bison", "yacc"]] + ["lib/liby.a"],
+    'dirs': [],
+}
+
+moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/b/Bison/Bison-3.0.4-foss-2015b.eb b/easybuild/easyconfigs/b/Bison/Bison-3.0.4-foss-2015b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..5555d066b86fd1db12bd3733c1609b500f7808ce
--- /dev/null
+++ b/easybuild/easyconfigs/b/Bison/Bison-3.0.4-foss-2015b.eb
@@ -0,0 +1,22 @@
+easyblock = 'ConfigureMake'
+
+name = 'Bison'
+version = '3.0.4'
+
+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': 'foss', 'version': '2015b'}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = [GNU_SOURCE]
+
+builddependencies = [('M4', '1.4.17')]
+
+sanity_check_paths = {
+    'files': ["bin/%s" % x for x in ["bison", "yacc"]] + ["lib/liby.a"],
+    'dirs': [],
+}
+
+moduleclass = 'lang'
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 28b4adc0bdb10d22b8b4c891a85a847747ec955a..5a270ebc00c4566c5666eb2464dc127706ae9165 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
@@ -23,9 +23,9 @@ 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",
-        "transposeLargeFile", "getCounts.py", "extractTranscriptInfo.py"]
+                       "estimateVBExpression", "extractSamples", "getFoldChange", "getGeneExpression",
+                       "getPPLR", "getVariance", "getWithinGeneExpression", "parseAlignment",
+                       "transposeLargeFile", "getCounts.py", "extractTranscriptInfo.py"]
 
 # this is the real EasyBuild line to copy all the executables to "bin"
 files_to_copy = [(list_of_executables, "bin")]
diff --git a/easybuild/easyconfigs/b/Bonnie++/Bonnie++-1.03e-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/b/Bonnie++/Bonnie++-1.03e-goalf-1.1.0-no-OFED.eb
index 41a9f3fdef693b5629a9595e1aace9e754bf7517..8bcb1abedd6c92e30eb2cf82721a097e6db4d6d8 100644
--- a/easybuild/easyconfigs/b/Bonnie++/Bonnie++-1.03e-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/b/Bonnie++/Bonnie++-1.03e-goalf-1.1.0-no-OFED.eb
@@ -21,8 +21,8 @@ source_urls = ['http://www.coker.com.au/bonnie++/']
 toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
 
 sanity_check_paths = {
-                      'files': ['sbin/bonnie++'],
-                      'dirs': []
-                     }
+    'files': ['sbin/bonnie++'],
+    'dirs': []
+}
 
 moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/b/Bonnie++/Bonnie++-1.03e-goolf-1.4.10.eb b/easybuild/easyconfigs/b/Bonnie++/Bonnie++-1.03e-goolf-1.4.10.eb
index 28f31121d6edf50b5a30bb35a740a8ed6b5f3298..fd432782eb508d5decd0f0d83c6fdc9130aaef0a 100644
--- a/easybuild/easyconfigs/b/Bonnie++/Bonnie++-1.03e-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/b/Bonnie++/Bonnie++-1.03e-goolf-1.4.10.eb
@@ -21,8 +21,8 @@ source_urls = ['http://www.coker.com.au/bonnie++/']
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 
 sanity_check_paths = {
-                      'files': ['sbin/bonnie++'],
-                      'dirs': []
-                     }
+    'files': ['sbin/bonnie++'],
+    'dirs': []
+}
 
 moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/b/Bonnie++/Bonnie++-1.03e-ictce-4.0.6.eb b/easybuild/easyconfigs/b/Bonnie++/Bonnie++-1.03e-ictce-4.0.6.eb
index 7b2aca1bc7457e91afa1c114a688f167bbd27bcb..f4e01e36bd64f7234278432296e24c8d75b63311 100644
--- a/easybuild/easyconfigs/b/Bonnie++/Bonnie++-1.03e-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/b/Bonnie++/Bonnie++-1.03e-ictce-4.0.6.eb
@@ -21,9 +21,8 @@ source_urls = ['http://www.coker.com.au/bonnie++/']
 toolchain = {'version': '4.0.6', 'name': 'ictce'}
 
 sanity_check_paths = {
-                      'files': ['sbin/bonnie++'],
-                      'dirs': []
-                     }
+    'files': ['sbin/bonnie++'],
+    'dirs': []
+}
 
 moduleclass = 'tools'
-
diff --git a/easybuild/easyconfigs/b/Bonnie++/Bonnie++-1.03e-ictce-5.3.0.eb b/easybuild/easyconfigs/b/Bonnie++/Bonnie++-1.03e-ictce-5.3.0.eb
index 80cfb940afd439f8157acba3a2fcead5651cf9d6..c663871a9cbcb73d716966885b489c5b46475535 100644
--- a/easybuild/easyconfigs/b/Bonnie++/Bonnie++-1.03e-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/b/Bonnie++/Bonnie++-1.03e-ictce-5.3.0.eb
@@ -22,9 +22,8 @@ source_urls = ['http://www.coker.com.au/bonnie++/']
 toolchain = {'name': 'ictce', 'version': '5.3.0'}
 
 sanity_check_paths = {
-                      'files': ['sbin/bonnie++'],
-                      'dirs': []
-                     }
+    'files': ['sbin/bonnie++'],
+    'dirs': []
+}
 
 moduleclass = 'tools'
-
diff --git a/easybuild/easyconfigs/b/Boost/Boost-1.47.0-goolf-1.4.10.eb b/easybuild/easyconfigs/b/Boost/Boost-1.47.0-goolf-1.4.10.eb
index 93386e296d8c731b1d6653507c70095123bb4d54..3a571ac328af4d7f0ccde7319273b1f1da9e5ba2 100644
--- a/easybuild/easyconfigs/b/Boost/Boost-1.47.0-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/b/Boost/Boost-1.47.0-goolf-1.4.10.eb
@@ -19,6 +19,6 @@ configopts = '--without-libraries=python'
 # also build boost_mpi
 boost_mpi = True
 
-osdependencies = [('zlib-devel','zlib1g-dev')]
+osdependencies = [('zlib-devel', 'zlib1g-dev')]
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/b/Boost/Boost-1.49.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb b/easybuild/easyconfigs/b/Boost/Boost-1.49.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb
index 3a7a1118355b1bcaa3824088ef417949ffc975cf..38cca32ea790dd7750b8f1866dc67f5d0e6e564c 100644
--- a/easybuild/easyconfigs/b/Boost/Boost-1.49.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/b/Boost/Boost-1.49.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb
@@ -21,6 +21,6 @@ dependencies = [
 # also build boost_mpi
 boost_mpi = True
 
-osdependencies = [('zlib-devel','zlib1g-dev')]
+osdependencies = [('zlib-devel', 'zlib1g-dev')]
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/b/Boost/Boost-1.49.0-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/b/Boost/Boost-1.49.0-goolf-1.4.10-Python-2.7.3.eb
index c961d98fd81d0dcc2d3c9564ae54c627f9aaf80c..26f6bca712d1b1b3988964cdf4c1192b0f6eb444 100644
--- a/easybuild/easyconfigs/b/Boost/Boost-1.49.0-goolf-1.4.10-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/b/Boost/Boost-1.49.0-goolf-1.4.10-Python-2.7.3.eb
@@ -21,6 +21,6 @@ dependencies = [
 # also build boost_mpi
 boost_mpi = True
 
-osdependencies = [('zlib-devel','zlib1g-dev')]
+osdependencies = [('zlib-devel', 'zlib1g-dev')]
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/b/Boost/Boost-1.49.0-goolf-1.4.10-Python-2.7.5.eb b/easybuild/easyconfigs/b/Boost/Boost-1.49.0-goolf-1.4.10-Python-2.7.5.eb
index 99ad6a98dc2cfee870d121e73353eb50a1539c37..a28c67be7043f4cc84f2a78c9e49e4f394018e3b 100644
--- a/easybuild/easyconfigs/b/Boost/Boost-1.49.0-goolf-1.4.10-Python-2.7.5.eb
+++ b/easybuild/easyconfigs/b/Boost/Boost-1.49.0-goolf-1.4.10-Python-2.7.5.eb
@@ -21,6 +21,6 @@ dependencies = [
 # also build boost_mpi
 boost_mpi = True
 
-osdependencies = [('zlib-devel','zlib1g-dev')]
+osdependencies = [('zlib-devel', 'zlib1g-dev')]
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/b/Boost/Boost-1.49.0-ictce-4.0.6-Python-2.7.3.eb b/easybuild/easyconfigs/b/Boost/Boost-1.49.0-ictce-4.0.6-Python-2.7.3.eb
index 7e087bb042e754059481cb31070efb5e3f38f958..f6191d854fcf6ebcbe5292822347e5caa26adb9e 100644
--- a/easybuild/easyconfigs/b/Boost/Boost-1.49.0-ictce-4.0.6-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/b/Boost/Boost-1.49.0-ictce-4.0.6-Python-2.7.3.eb
@@ -23,6 +23,6 @@ dependencies = [
 # also build boost_mpi
 boost_mpi = True
 
-osdependencies = [('zlib-devel','zlib1g-dev')]
+osdependencies = [('zlib-devel', 'zlib1g-dev')]
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/b/Boost/Boost-1.49.0-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/b/Boost/Boost-1.49.0-ictce-5.3.0-Python-2.7.3.eb
index 3988e42a3d0263505efcd5b707a709ce3ec0c1b9..ea0b132e922878d0e5634836bfe2a2fc9e41a84b 100644
--- a/easybuild/easyconfigs/b/Boost/Boost-1.49.0-ictce-5.3.0-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/b/Boost/Boost-1.49.0-ictce-5.3.0-Python-2.7.3.eb
@@ -23,6 +23,6 @@ dependencies = [
 # also build boost_mpi
 boost_mpi = True
 
-osdependencies = [('zlib-devel','zlib1g-dev')]
+osdependencies = [('zlib-devel', 'zlib1g-dev')]
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/b/Boost/Boost-1.51.0-gmpolf-1.4.8.eb b/easybuild/easyconfigs/b/Boost/Boost-1.51.0-gmpolf-1.4.8.eb
index 6d898a6437a30dba725b798cd93463d2a2817e96..4d9a1a23d135bc6ea0591916467b76d4b6405628 100644
--- a/easybuild/easyconfigs/b/Boost/Boost-1.51.0-gmpolf-1.4.8.eb
+++ b/easybuild/easyconfigs/b/Boost/Boost-1.51.0-gmpolf-1.4.8.eb
@@ -17,6 +17,6 @@ configopts = '--without-libraries=python'
 # also build boost_mpi
 boost_mpi = True
 
-osdependencies = [('zlib-devel','zlib1g-dev')]
-#maxparallel=1
+osdependencies = [('zlib-devel', 'zlib1g-dev')]
+# maxparallel=1
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/b/Boost/Boost-1.51.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb b/easybuild/easyconfigs/b/Boost/Boost-1.51.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb
index d48b1c70a11c138cb458c383baf35e6cd4dc3801..26a0348c88afb09d48e57f65a76f5af74dcba144 100644
--- a/easybuild/easyconfigs/b/Boost/Boost-1.51.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/b/Boost/Boost-1.51.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb
@@ -21,6 +21,6 @@ dependencies = [
 # also build boost_mpi
 boost_mpi = True
 
-osdependencies = [('zlib-devel','zlib1g-dev')]
+osdependencies = [('zlib-devel', 'zlib1g-dev')]
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/b/Boost/Boost-1.51.0-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/b/Boost/Boost-1.51.0-goalf-1.1.0-no-OFED.eb
index cb53c502fcf6bd0fdf889ded00a12e566c9b9fa7..5841132659194143c39a74af47e77d3473b1a858 100644
--- a/easybuild/easyconfigs/b/Boost/Boost-1.51.0-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/b/Boost/Boost-1.51.0-goalf-1.1.0-no-OFED.eb
@@ -17,6 +17,6 @@ configopts = '--without-libraries=python'
 # also build boost_mpi
 boost_mpi = True
 
-osdependencies = [('zlib-devel','zlib1g-dev')]
+osdependencies = [('zlib-devel', 'zlib1g-dev')]
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/b/Boost/Boost-1.51.0-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/b/Boost/Boost-1.51.0-goolf-1.4.10-Python-2.7.3.eb
index 313d9d65c46c2e5d09875c222a4d380907b23a1f..95d230ca9d371916fdc8d4a577dd0c38149d6f68 100644
--- a/easybuild/easyconfigs/b/Boost/Boost-1.51.0-goolf-1.4.10-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/b/Boost/Boost-1.51.0-goolf-1.4.10-Python-2.7.3.eb
@@ -21,6 +21,6 @@ dependencies = [
 # also build boost_mpi
 boost_mpi = True
 
-osdependencies = [('zlib-devel','zlib1g-dev')]
+osdependencies = [('zlib-devel', 'zlib1g-dev')]
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/b/Boost/Boost-1.51.0-goolf-1.4.10.eb b/easybuild/easyconfigs/b/Boost/Boost-1.51.0-goolf-1.4.10.eb
index f5cc38969b0cd92e543e7e1845f9b464c91e5747..fe0aacf8ddb6b94477c80043af517c990a2588f6 100644
--- a/easybuild/easyconfigs/b/Boost/Boost-1.51.0-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/b/Boost/Boost-1.51.0-goolf-1.4.10.eb
@@ -17,6 +17,6 @@ configopts = '--without-libraries=python'
 # also build boost_mpi
 boost_mpi = True
 
-osdependencies = [('zlib-devel','zlib1g-dev')]
+osdependencies = [('zlib-devel', 'zlib1g-dev')]
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/b/Boost/Boost-1.51.0-ictce-4.0.6-Python-2.7.3.eb b/easybuild/easyconfigs/b/Boost/Boost-1.51.0-ictce-4.0.6-Python-2.7.3.eb
index b323695956a98552016bb7683495d8e60510f3cc..7d098018b7c36db2ed1d0ab666a059ccf56413cc 100644
--- a/easybuild/easyconfigs/b/Boost/Boost-1.51.0-ictce-4.0.6-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/b/Boost/Boost-1.51.0-ictce-4.0.6-Python-2.7.3.eb
@@ -23,6 +23,6 @@ dependencies = [
 # also build boost_mpi
 boost_mpi = True
 
-osdependencies = [('zlib-devel','zlib1g-dev')]
+osdependencies = [('zlib-devel', 'zlib1g-dev')]
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/b/Boost/Boost-1.51.0-ictce-4.0.6.eb b/easybuild/easyconfigs/b/Boost/Boost-1.51.0-ictce-4.0.6.eb
index 709900a2b0db7413075a1c7d50ae482beeff7596..20af60928b24cf8cf3d161f92b00ede17f3cf74a 100644
--- a/easybuild/easyconfigs/b/Boost/Boost-1.51.0-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/b/Boost/Boost-1.51.0-ictce-4.0.6.eb
@@ -17,6 +17,6 @@ configopts = '--without-libraries=python'
 # also build boost_mpi
 boost_mpi = True
 
-osdependencies = [('zlib-devel','zlib1g-dev')]
+osdependencies = [('zlib-devel', 'zlib1g-dev')]
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/b/Boost/Boost-1.51.0-ictce-4.1.13.eb b/easybuild/easyconfigs/b/Boost/Boost-1.51.0-ictce-4.1.13.eb
index edcf74cbec7b0d9f0f2fdbc31299d4451b9386c9..9b9c1f416c810345bf3a20410e482ed3e6ee4433 100644
--- a/easybuild/easyconfigs/b/Boost/Boost-1.51.0-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/b/Boost/Boost-1.51.0-ictce-4.1.13.eb
@@ -17,6 +17,6 @@ configopts = '--without-libraries=python'
 # also build boost_mpi
 boost_mpi = True
 
-osdependencies = [('zlib-devel','zlib1g-dev')]
+osdependencies = [('zlib-devel', 'zlib1g-dev')]
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/b/Boost/Boost-1.51.0-ictce-5.2.0.eb b/easybuild/easyconfigs/b/Boost/Boost-1.51.0-ictce-5.2.0.eb
index 97d8361b7ac5241d7f3fabda2a954e228814f676..078df28545e45a72eae1b3c641b4d2fa81432dce 100644
--- a/easybuild/easyconfigs/b/Boost/Boost-1.51.0-ictce-5.2.0.eb
+++ b/easybuild/easyconfigs/b/Boost/Boost-1.51.0-ictce-5.2.0.eb
@@ -17,6 +17,6 @@ configopts = '--without-libraries=python'
 # also build boost_mpi
 boost_mpi = True
 
-osdependencies = [('zlib-devel','zlib1g-dev')]
+osdependencies = [('zlib-devel', 'zlib1g-dev')]
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/b/Boost/Boost-1.51.0-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/b/Boost/Boost-1.51.0-ictce-5.3.0-Python-2.7.3.eb
index 13e799e0760871ac02b0254c68437ae914e03084..c0d9d3958e2714a268a7eb244d987e18a23c2622 100644
--- a/easybuild/easyconfigs/b/Boost/Boost-1.51.0-ictce-5.3.0-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/b/Boost/Boost-1.51.0-ictce-5.3.0-Python-2.7.3.eb
@@ -23,6 +23,6 @@ dependencies = [
 # also build boost_mpi
 boost_mpi = True
 
-osdependencies = [('zlib-devel','zlib1g-dev')]
+osdependencies = [('zlib-devel', 'zlib1g-dev')]
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/b/Boost/Boost-1.51.0-ictce-5.3.0.eb b/easybuild/easyconfigs/b/Boost/Boost-1.51.0-ictce-5.3.0.eb
index b49e9e58e9021ec6f2b1a74d19dab4c529abfd38..016ded779dc1a6955f8e888c8ec9895f574154e9 100644
--- a/easybuild/easyconfigs/b/Boost/Boost-1.51.0-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/b/Boost/Boost-1.51.0-ictce-5.3.0.eb
@@ -17,6 +17,6 @@ configopts = '--without-libraries=python'
 # also build boost_mpi
 boost_mpi = True
 
-osdependencies = [('zlib-devel','zlib1g-dev')]
+osdependencies = [('zlib-devel', 'zlib1g-dev')]
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/b/Boost/Boost-1.53.0-goalf-1.5.12-no-OFED-Python-2.7.5.eb b/easybuild/easyconfigs/b/Boost/Boost-1.53.0-goalf-1.5.12-no-OFED-Python-2.7.5.eb
index 403498d6f458c2dcd6c6e567700b1923e7fb0a2e..8177dfdfc776571aadf49646ddc7f792d17aed73 100644
--- a/easybuild/easyconfigs/b/Boost/Boost-1.53.0-goalf-1.5.12-no-OFED-Python-2.7.5.eb
+++ b/easybuild/easyconfigs/b/Boost/Boost-1.53.0-goalf-1.5.12-no-OFED-Python-2.7.5.eb
@@ -21,6 +21,6 @@ dependencies = [
 # also build boost_mpi
 boost_mpi = True
 
-osdependencies = [('zlib-devel','zlib1g-dev')]
+osdependencies = [('zlib-devel', 'zlib1g-dev')]
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/b/Boost/Boost-1.53.0-goolf-1.4.10.eb b/easybuild/easyconfigs/b/Boost/Boost-1.53.0-goolf-1.4.10.eb
index 6e295b56b64186b40ea84f54eb25308ed35e3106..90c4f9d0e59b111231bb36fbe97cec22a7944518 100644
--- a/easybuild/easyconfigs/b/Boost/Boost-1.53.0-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/b/Boost/Boost-1.53.0-goolf-1.4.10.eb
@@ -17,6 +17,6 @@ configopts = '--without-libraries=python'
 # also build boost_mpi
 boost_mpi = True
 
-osdependencies = [('zlib-devel','zlib1g-dev')]
+osdependencies = [('zlib-devel', 'zlib1g-dev')]
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/b/Boost/Boost-1.53.0-ictce-4.1.13-Python-2.7.3.eb b/easybuild/easyconfigs/b/Boost/Boost-1.53.0-ictce-4.1.13-Python-2.7.3.eb
index 354f0c72605ce48c02972a5c86a33e74f9942082..15ca81dd99b439875fd903194e1e0c0f13b8d5cb 100644
--- a/easybuild/easyconfigs/b/Boost/Boost-1.53.0-ictce-4.1.13-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/b/Boost/Boost-1.53.0-ictce-4.1.13-Python-2.7.3.eb
@@ -23,6 +23,6 @@ dependencies = [
 # also build boost_mpi
 boost_mpi = True
 
-osdependencies = [('zlib-devel','zlib1g-dev')]
+osdependencies = [('zlib-devel', 'zlib1g-dev')]
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/b/Boost/Boost-1.53.0-ictce-4.1.13.eb b/easybuild/easyconfigs/b/Boost/Boost-1.53.0-ictce-4.1.13.eb
index fad7f26ba91bd8d3e0959b4be7620ba8946e42b8..e59984e8e7123ac3400207943625f098243e82ce 100644
--- a/easybuild/easyconfigs/b/Boost/Boost-1.53.0-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/b/Boost/Boost-1.53.0-ictce-4.1.13.eb
@@ -17,6 +17,6 @@ configopts = '--without-libraries=python'
 # also build boost_mpi
 boost_mpi = True
 
-osdependencies = [('zlib-devel','zlib1g-dev')]
+osdependencies = [('zlib-devel', 'zlib1g-dev')]
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/b/Boost/Boost-1.53.0-ictce-5.2.0.eb b/easybuild/easyconfigs/b/Boost/Boost-1.53.0-ictce-5.2.0.eb
index 472f8aa41f853e3a6eca237bc5189c1659349f08..6c8ec824c0217f31636f0abf941035df9ddda5ad 100644
--- a/easybuild/easyconfigs/b/Boost/Boost-1.53.0-ictce-5.2.0.eb
+++ b/easybuild/easyconfigs/b/Boost/Boost-1.53.0-ictce-5.2.0.eb
@@ -17,6 +17,6 @@ configopts = '--without-libraries=python'
 # also build boost_mpi
 boost_mpi = True
 
-osdependencies = [('zlib-devel','zlib1g-dev')]
+osdependencies = [('zlib-devel', 'zlib1g-dev')]
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/b/Boost/Boost-1.53.0-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/b/Boost/Boost-1.53.0-ictce-5.3.0-Python-2.7.3.eb
index b82fa3aec47588d8593133b25bfd700303a3fa0f..79d1f8548355c32d2fdb95deee92380e17814d1e 100644
--- a/easybuild/easyconfigs/b/Boost/Boost-1.53.0-ictce-5.3.0-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/b/Boost/Boost-1.53.0-ictce-5.3.0-Python-2.7.3.eb
@@ -23,6 +23,6 @@ dependencies = [
 # also build boost_mpi
 boost_mpi = True
 
-osdependencies = [('zlib-devel','zlib1g-dev')]
+osdependencies = [('zlib-devel', 'zlib1g-dev')]
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/b/Boost/Boost-1.53.0-ictce-5.3.0-Python-2.7.5.eb b/easybuild/easyconfigs/b/Boost/Boost-1.53.0-ictce-5.3.0-Python-2.7.5.eb
index e55911ea5956bcd2d1c651b2a282cfbb54f7de9b..0ed130e7a2f01a3bc0fa54867761d191d04e4ed3 100644
--- a/easybuild/easyconfigs/b/Boost/Boost-1.53.0-ictce-5.3.0-Python-2.7.5.eb
+++ b/easybuild/easyconfigs/b/Boost/Boost-1.53.0-ictce-5.3.0-Python-2.7.5.eb
@@ -21,6 +21,6 @@ dependencies = [
 # also build boost_mpi
 boost_mpi = True
 
-osdependencies = [('zlib-devel','zlib1g-dev')]
+osdependencies = [('zlib-devel', 'zlib1g-dev')]
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/b/Boost/Boost-1.53.0-ictce-5.3.0.eb b/easybuild/easyconfigs/b/Boost/Boost-1.53.0-ictce-5.3.0.eb
index a7526a054e181d7f95f9c84a1ea8075d92fa4e79..125204c6c15c08a20ee2473fda9eb9f214074eb0 100644
--- a/easybuild/easyconfigs/b/Boost/Boost-1.53.0-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/b/Boost/Boost-1.53.0-ictce-5.3.0.eb
@@ -17,6 +17,6 @@ configopts = '--without-libraries=python'
 # also build boost_mpi
 boost_mpi = True
 
-osdependencies = [('zlib-devel','zlib1g-dev')]
+osdependencies = [('zlib-devel', 'zlib1g-dev')]
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/b/Boost/Boost-1.53.0-ictce-5.5.0-Python-2.7.5.eb b/easybuild/easyconfigs/b/Boost/Boost-1.53.0-ictce-5.5.0-Python-2.7.5.eb
index c3ef0179641b762130af8d66662444d71f65f1b8..d634055e6253f8e6dd239b70427fc2ca9db803bd 100644
--- a/easybuild/easyconfigs/b/Boost/Boost-1.53.0-ictce-5.5.0-Python-2.7.5.eb
+++ b/easybuild/easyconfigs/b/Boost/Boost-1.53.0-ictce-5.5.0-Python-2.7.5.eb
@@ -23,6 +23,6 @@ dependencies = [
 # also build boost_mpi
 boost_mpi = True
 
-osdependencies = [('zlib-devel','zlib1g-dev')]
+osdependencies = [('zlib-devel', 'zlib1g-dev')]
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/b/Boost/Boost-1.53.0-ictce-6.2.5.eb b/easybuild/easyconfigs/b/Boost/Boost-1.53.0-ictce-6.2.5.eb
index 5d078f75268b921eb796823c3d035c0fb815f11b..2d3562ccc9e4217748cf6dad60cc72e36f1f637c 100644
--- a/easybuild/easyconfigs/b/Boost/Boost-1.53.0-ictce-6.2.5.eb
+++ b/easybuild/easyconfigs/b/Boost/Boost-1.53.0-ictce-6.2.5.eb
@@ -17,6 +17,6 @@ configopts = '--without-libraries=python'
 # also build boost_mpi
 boost_mpi = True
 
-osdependencies = [('zlib-devel','zlib1g-dev')]
+osdependencies = [('zlib-devel', 'zlib1g-dev')]
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/b/Boost/Boost-1.55.0-ictce-5.5.0-Python-2.7.6.eb b/easybuild/easyconfigs/b/Boost/Boost-1.55.0-ictce-5.5.0-Python-2.7.6.eb
index 87a7b60a53b52d85ed73016a85ad7c59466e1a2b..6436848a16fec65179ecef3650feef1c6f2f296f 100644
--- a/easybuild/easyconfigs/b/Boost/Boost-1.55.0-ictce-5.5.0-Python-2.7.6.eb
+++ b/easybuild/easyconfigs/b/Boost/Boost-1.55.0-ictce-5.5.0-Python-2.7.6.eb
@@ -23,6 +23,6 @@ dependencies = [
 # also build boost_mpi
 boost_mpi = True
 
-osdependencies = [('zlib-devel','zlib1g-dev')]
+osdependencies = [('zlib-devel', 'zlib1g-dev')]
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/b/Boost/Boost-1.55.0-ictce-7.1.2-Python-2.7.8.eb b/easybuild/easyconfigs/b/Boost/Boost-1.55.0-ictce-7.1.2-Python-2.7.8.eb
index d29dcc1cdae5e793c3855bd382c45bb5196889e9..005df0b62444787aa235591892d62610ba8495df 100644
--- a/easybuild/easyconfigs/b/Boost/Boost-1.55.0-ictce-7.1.2-Python-2.7.8.eb
+++ b/easybuild/easyconfigs/b/Boost/Boost-1.55.0-ictce-7.1.2-Python-2.7.8.eb
@@ -23,6 +23,6 @@ dependencies = [
 # also build boost_mpi
 boost_mpi = True
 
-osdependencies = [('zlib-devel','zlib1g-dev')]
+osdependencies = [('zlib-devel', 'zlib1g-dev')]
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/b/Boost/Boost-1.55.0.eb b/easybuild/easyconfigs/b/Boost/Boost-1.55.0.eb
index fb5ddf01857867a9af2fac0eff274ba480b33b8c..9e85b84df70ef426c0a410077dd3602fef1eb1d8 100644
--- a/easybuild/easyconfigs/b/Boost/Boost-1.55.0.eb
+++ b/easybuild/easyconfigs/b/Boost/Boost-1.55.0.eb
@@ -16,6 +16,6 @@ configopts = '--without-libraries=python'
 
 toolset = 'gcc'
 
-osdependencies = [('zlib-devel','zlib1g-dev')]
+osdependencies = [('zlib-devel', 'zlib1g-dev')]
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/b/Boost/Boost-1.57.0-gimkl-2.11.5-Python-2.7.10.eb b/easybuild/easyconfigs/b/Boost/Boost-1.57.0-gimkl-2.11.5-Python-2.7.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..0efec2bdf2fc1096d7776dd86d8732dca72cbec6
--- /dev/null
+++ b/easybuild/easyconfigs/b/Boost/Boost-1.57.0-gimkl-2.11.5-Python-2.7.10.eb
@@ -0,0 +1,25 @@
+name = 'Boost'
+version = '1.57.0'
+
+homepage = 'http://www.boost.org/'
+description = """Boost provides free peer-reviewed portable C++ source libraries."""
+
+toolchain = {'name': 'gimkl', 'version': '2.11.5'}
+toolchainopts = {'pic': True, 'usempi': True}
+
+source_urls = [SOURCEFORGE_SOURCE]
+sources = ['%%(namelower)s_%s.tar.gz' % '_'.join(version.split('.'))]
+
+pythonversion = '2.7.10'
+versionsuffix = '-Python-%s' % pythonversion
+
+dependencies = [
+    ('bzip2', '1.0.6'),
+    ('zlib', '1.2.8'),
+    ('Python', pythonversion),
+]
+
+# also build boost_mpi
+boost_mpi = True
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/b/Boost/Boost-1.60.0-foss-2016a.eb b/easybuild/easyconfigs/b/Boost/Boost-1.60.0-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..c50510711dba9e3d0833c53637a8cb56915a465e
--- /dev/null
+++ b/easybuild/easyconfigs/b/Boost/Boost-1.60.0-foss-2016a.eb
@@ -0,0 +1,23 @@
+name = 'Boost'
+version = '1.60.0'
+
+homepage = 'http://www.boost.org/'
+description = """Boost provides free peer-reviewed portable C++ source libraries."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+toolchainopts = {'pic': True, 'usempi': True}
+
+sources = ['%%(namelower)s_%s.tar.gz' % '_'.join(version.split('.'))]
+source_urls = [SOURCEFORGE_SOURCE]
+
+dependencies = [
+    ('bzip2', '1.0.6'),
+    ('zlib', '1.2.8'),
+]
+
+configopts = '--without-libraries=python'
+
+# also build boost_mpi
+boost_mpi = True
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/b/Bowtie/Bowtie-1.1.1-goolf-1.4.10.eb b/easybuild/easyconfigs/b/Bowtie/Bowtie-1.1.1-goolf-1.4.10.eb
index 0240ff0e2c2cedef6f93bbf1400c72e9a3b3152b..b0b3446182925dada704f802595e69b10886f4d4 100644
--- a/easybuild/easyconfigs/b/Bowtie/Bowtie-1.1.1-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/b/Bowtie/Bowtie-1.1.1-goolf-1.4.10.eb
@@ -1,6 +1,6 @@
-#Modified from existing version by:
-#Robert Schmidt <rjeschmi@gmail.com>
-#Ottawa Hospital Research Institute - Bioinformatics Team
+# Modified from existing version by:
+# Robert Schmidt <rjeschmi@gmail.com>
+# Ottawa Hospital Research Institute - Bioinformatics Team
 
 name = 'Bowtie'
 version = '1.1.1'
diff --git a/easybuild/easyconfigs/b/Bowtie/Bowtie-1.1.2-foss-2015b.eb b/easybuild/easyconfigs/b/Bowtie/Bowtie-1.1.2-foss-2015b.eb
index 74828669ae4cdc7dccb54fdf3c7d4d5ef9c2a9c8..b83380f7c8cd6433625ddeac2f495dba5752a382 100644
--- a/easybuild/easyconfigs/b/Bowtie/Bowtie-1.1.2-foss-2015b.eb
+++ b/easybuild/easyconfigs/b/Bowtie/Bowtie-1.1.2-foss-2015b.eb
@@ -1,6 +1,6 @@
-#Modified from existing version by:
-#Robert Schmidt <rjeschmi@gmail.com>
-#Ottawa Hospital Research Institute - Bioinformatics Team
+# Modified from existing version by:
+# Robert Schmidt <rjeschmi@gmail.com>
+# Ottawa Hospital Research Institute - Bioinformatics Team
 name = 'Bowtie'
 version = '1.1.2'
 
diff --git a/easybuild/easyconfigs/b/Bowtie/Bowtie-1.1.2-intel-2015a.eb b/easybuild/easyconfigs/b/Bowtie/Bowtie-1.1.2-intel-2015a.eb
index 88375672878455d1d993fbc1bb508f34e44ffcb5..6eb22c637f5bbc8f221e502bca75b63b768d1a64 100644
--- a/easybuild/easyconfigs/b/Bowtie/Bowtie-1.1.2-intel-2015a.eb
+++ b/easybuild/easyconfigs/b/Bowtie/Bowtie-1.1.2-intel-2015a.eb
@@ -1,6 +1,6 @@
-#Modified from existing version by:
-#Robert Schmidt <rjeschmi@gmail.com>
-#Ottawa Hospital Research Institute - Bioinformatics Team
+# Modified from existing version by:
+# Robert Schmidt <rjeschmi@gmail.com>
+# Ottawa Hospital Research Institute - Bioinformatics Team
 name = 'Bowtie'
 version = '1.1.2'
 
@@ -18,4 +18,3 @@ source_urls = ['http://download.sourceforge.net/bowtie-bio/']
 patches = ['int64typedef.patch']
 
 moduleclass = 'bio'
-
diff --git a/easybuild/easyconfigs/b/Bowtie/Bowtie-1.1.2-intel-2015b.eb b/easybuild/easyconfigs/b/Bowtie/Bowtie-1.1.2-intel-2015b.eb
index 63be2bee21c94f8ead66096b5b4b2765fc91d523..e8fb12a0cf2c076d16c57f93a2c5f50b9e73973e 100644
--- a/easybuild/easyconfigs/b/Bowtie/Bowtie-1.1.2-intel-2015b.eb
+++ b/easybuild/easyconfigs/b/Bowtie/Bowtie-1.1.2-intel-2015b.eb
@@ -1,6 +1,6 @@
-#Modified from existing version by:
-#Robert Schmidt <rjeschmi@gmail.com>
-#Ottawa Hospital Research Institute - Bioinformatics Team
+# Modified from existing version by:
+# Robert Schmidt <rjeschmi@gmail.com>
+# Ottawa Hospital Research Institute - Bioinformatics Team
 name = 'Bowtie'
 version = '1.1.2'
 
@@ -18,4 +18,3 @@ source_urls = ['http://download.sourceforge.net/bowtie-bio/']
 patches = ['int64typedef.patch']
 
 moduleclass = 'bio'
-
diff --git a/easybuild/easyconfigs/b/Bowtie2/Bowtie2-2.0.2-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/b/Bowtie2/Bowtie2-2.0.2-goalf-1.1.0-no-OFED.eb
index 89e89457faf3f5dae39a69318f38edc2ebd1ed05..99061a9473501539884d8728301524267c581d04 100644
--- a/easybuild/easyconfigs/b/Bowtie2/Bowtie2-2.0.2-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/b/Bowtie2/Bowtie2-2.0.2-goalf-1.1.0-no-OFED.eb
@@ -21,8 +21,8 @@ description = """Bowtie 2 is an ultrafast and memory-efficient tool
 toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
 toolchainopts = {'optarch': True, 'pic': True}
 
-sources = ['%s-%s-source.zip' % (name.lower(), version)]
-source_urls = [('http://sourceforge.net/projects/bowtie-bio/files/%s/%s' % (name.lower(), version), 'download')]
+sources = ['%(namelower)s-%(version)s-source.zip']
+source_urls = [('http://sourceforge.net/projects/bowtie-bio/files/%(namelower)s/%(version)s', 'download')]
 # N.B. the download option above -> required for sourceforge
 
 moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/b/Bowtie2/Bowtie2-2.0.2-goolf-1.4.10.eb b/easybuild/easyconfigs/b/Bowtie2/Bowtie2-2.0.2-goolf-1.4.10.eb
index e98e0de64efa08d6b0f372b87b72c6b72d7a12ce..13ddeb08e17c0524439586898d40447635704dd8 100644
--- a/easybuild/easyconfigs/b/Bowtie2/Bowtie2-2.0.2-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/b/Bowtie2/Bowtie2-2.0.2-goolf-1.4.10.eb
@@ -21,8 +21,8 @@ for aligning sequencing reads to long reference sequences."""
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 toolchainopts = {'optarch': True, 'pic': True}
 
-sources = ['%s-%s-source.zip' % (name.lower(), version)]
-source_urls = [('http://sourceforge.net/projects/bowtie-bio/files/%s/%s' % (name.lower(), version), 'download')]
+sources = ['%(namelower)s-%(version)s-source.zip']
+source_urls = [('http://sourceforge.net/projects/bowtie-bio/files/%(namelower)s/%(version)s', 'download')]
 # N.B. the download option above -> required for sourceforge
 
 moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/b/Bowtie2/Bowtie2-2.0.2-ictce-4.0.6.eb b/easybuild/easyconfigs/b/Bowtie2/Bowtie2-2.0.2-ictce-4.0.6.eb
index ffd1114704c6633461a5ef0905857764218940a7..15a2db61d2f30b9951ec62a56b6f73868b5eb438 100644
--- a/easybuild/easyconfigs/b/Bowtie2/Bowtie2-2.0.2-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/b/Bowtie2/Bowtie2-2.0.2-ictce-4.0.6.eb
@@ -21,8 +21,8 @@ description = """Bowtie 2 is an ultrafast and memory-efficient tool
 toolchain = {'name': 'ictce', 'version': '4.0.6'}
 toolchainopts = {'optarch': True, 'pic': True}
 
-sources = ['%s-%s-source.zip' % (name.lower(), version)]
-source_urls = [('http://sourceforge.net/projects/bowtie-bio/files/%s/%s' % (name.lower(), version), 'download')]
+sources = ['%(namelower)s-%(version)s-source.zip']
+source_urls = [('http://sourceforge.net/projects/bowtie-bio/files/%(namelower)s/%(version)s', 'download')]
 # N.B. the download option above -> required for sourceforge
 
 moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/b/Bowtie2/Bowtie2-2.0.2-ictce-5.3.0.eb b/easybuild/easyconfigs/b/Bowtie2/Bowtie2-2.0.2-ictce-5.3.0.eb
index f08ff35329d3a290a51dcc2c930183b5d0b23fa4..7f8fbd5ca686bb401efd6678973aad32f8813a86 100644
--- a/easybuild/easyconfigs/b/Bowtie2/Bowtie2-2.0.2-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/b/Bowtie2/Bowtie2-2.0.2-ictce-5.3.0.eb
@@ -22,8 +22,8 @@ description = """Bowtie 2 is an ultrafast and memory-efficient tool
 toolchain = {'name': 'ictce', 'version': '5.3.0'}
 toolchainopts = {'optarch': True, 'pic': True}
 
-sources = ['%s-%s-source.zip' % (name.lower(), version)]
-source_urls = [('http://sourceforge.net/projects/bowtie-bio/files/%s/%s' % (name.lower(), version), 'download')]
+sources = ['%(namelower)s-%(version)s-source.zip']
+source_urls = [('http://sourceforge.net/projects/bowtie-bio/files/%(namelower)s/%(version)s', 'download')]
 # N.B. the download option above -> required for sourceforge
 
 moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/b/Bowtie2/Bowtie2-2.0.5-goolf-1.4.10.eb b/easybuild/easyconfigs/b/Bowtie2/Bowtie2-2.0.5-goolf-1.4.10.eb
index ae75b8cebd5cc31303f618a15ba84d9f2bd2ef5c..361932b89cf66fc3f5e5770f57e65e6cb6a55e1f 100644
--- a/easybuild/easyconfigs/b/Bowtie2/Bowtie2-2.0.5-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/b/Bowtie2/Bowtie2-2.0.5-goolf-1.4.10.eb
@@ -3,7 +3,7 @@
 # Swiss Institute of Bioinformatics
 # Biozentrum - University of Basel
 
-easyblock='MakeCp'
+easyblock = 'MakeCp'
 
 name = 'Bowtie2'
 version = '2.0.5'
@@ -17,12 +17,12 @@ description = """ Bowtie 2 is an ultrafast and memory-efficient tool for alignin
 
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 
-sources = ['%s-%s-source.zip' % (name.lower(), version)]
+sources = ['%(namelower)s-%(version)s-source.zip']
 source_urls = [('http://sourceforge.net/projects/bowtie-bio/files/%(namelower)s/%(version)s', 'download')]
 
 files_to_copy = [
     (["bowtie2", "bowtie2-align", "bowtie2-build", "bowtie2-inspect"], 'bin'),
-    "doc", "example", "scripts",]
+    "doc", "example", "scripts"]
 
 sanity_check_paths = {
     'files': ["bin/bowtie2-align", "bin/bowtie2-build", "bin/bowtie2-inspect"],
diff --git a/easybuild/easyconfigs/b/Bowtie2/Bowtie2-2.0.6-goolf-1.4.10.eb b/easybuild/easyconfigs/b/Bowtie2/Bowtie2-2.0.6-goolf-1.4.10.eb
index 640a7f6d8391e83d33033b52ca7070a5d0fd7800..02e855be5b27e6d8f6313193ed50d9f4263c0ada 100644
--- a/easybuild/easyconfigs/b/Bowtie2/Bowtie2-2.0.6-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/b/Bowtie2/Bowtie2-2.0.6-goolf-1.4.10.eb
@@ -3,7 +3,7 @@
 # Swiss Institute of Bioinformatics
 # Biozentrum - University of Basel
 
-easyblock='MakeCp'
+easyblock = 'MakeCp'
 
 name = 'Bowtie2'
 version = '2.0.6'
@@ -17,7 +17,7 @@ description = """ Bowtie 2 is an ultrafast and memory-efficient tool for alignin
 
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 
-sources = ['%s-%s-source.zip' % (name.lower(), version)]
+sources = ['%(namelower)s-%(version)s-source.zip']
 source_urls = [('http://sourceforge.net/projects/bowtie-bio/files/%(namelower)s/%(version)s', 'download')]
 
 files_to_copy = [
diff --git a/easybuild/easyconfigs/b/Bowtie2/Bowtie2-2.1.0-goolf-1.4.10.eb b/easybuild/easyconfigs/b/Bowtie2/Bowtie2-2.1.0-goolf-1.4.10.eb
index 93890f908fea8e1b40e2018e9066201cc30e9d6e..2877853840d364494895198b049256e992708cba 100644
--- a/easybuild/easyconfigs/b/Bowtie2/Bowtie2-2.1.0-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/b/Bowtie2/Bowtie2-2.1.0-goolf-1.4.10.eb
@@ -3,7 +3,7 @@
 # Swiss Institute of Bioinformatics
 # Biozentrum - University of Basel
 
-easyblock='MakeCp'
+easyblock = 'MakeCp'
 
 name = 'Bowtie2'
 version = '2.1.0'
@@ -17,12 +17,12 @@ description = """ Bowtie 2 is an ultrafast and memory-efficient tool for alignin
 
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 
-sources = ['%s-%s-source.zip' % (name.lower(), version)]
+sources = ['%(namelower)s-%(version)s-source.zip']
 source_urls = [('http://sourceforge.net/projects/bowtie-bio/files/%(namelower)s/%(version)s', 'download')]
 
 files_to_copy = [
     (["bowtie2", "bowtie2-align", "bowtie2-build", "bowtie2-inspect"], 'bin'),
-    "doc", "example","scripts"]
+    "doc", "example", "scripts"]
 
 sanity_check_paths = {
     'files': ["bin/bowtie2-align", "bin/bowtie2-build", "bin/bowtie2-inspect"],
diff --git a/easybuild/easyconfigs/b/Bowtie2/Bowtie2-2.2.0-goolf-1.4.10.eb b/easybuild/easyconfigs/b/Bowtie2/Bowtie2-2.2.0-goolf-1.4.10.eb
index 6dbb873164f05a32c1a0d1efb909e62d46184b7d..58e8cf38d8d26c879d9eb9cfda92c19341882cd5 100644
--- a/easybuild/easyconfigs/b/Bowtie2/Bowtie2-2.2.0-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/b/Bowtie2/Bowtie2-2.2.0-goolf-1.4.10.eb
@@ -3,7 +3,7 @@
 # Swiss Institute of Bioinformatics
 # Biozentrum - University of Basel
 
-easyblock='MakeCp'
+easyblock = 'MakeCp'
 
 name = 'Bowtie2'
 version = '2.2.0'
@@ -17,12 +17,12 @@ description = """ Bowtie 2 is an ultrafast and memory-efficient tool for alignin
 
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 
-sources = ['%s-%s-source.zip' % (name.lower(), version)]
+sources = ['%(namelower)s-%(version)s-source.zip']
 source_urls = [('http://sourceforge.net/projects/bowtie-bio/files/%(namelower)s/%(version)s', 'download')]
 
 files_to_copy = [
     (["bowtie2", "bowtie2-align-l", "bowtie2-align-s", "bowtie2-build", "bowtie2-build-l", "bowtie2-build-s",
-     "bowtie2-inspect", "bowtie2-inspect-l", "bowtie2-inspect-s"], 'bin'),
+      "bowtie2-inspect", "bowtie2-inspect-l", "bowtie2-inspect-s"], 'bin'),
     "doc", "example", "scripts"]
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/b/Bowtie2/Bowtie2-2.2.2-goolf-1.4.10.eb b/easybuild/easyconfigs/b/Bowtie2/Bowtie2-2.2.2-goolf-1.4.10.eb
index 83794c9d53ecc8da483acb8edaa2f557e3e28744..da1514917367898ad7f3ac7885c7419eedb5796d 100644
--- a/easybuild/easyconfigs/b/Bowtie2/Bowtie2-2.2.2-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/b/Bowtie2/Bowtie2-2.2.2-goolf-1.4.10.eb
@@ -3,7 +3,7 @@
 # Swiss Institute of Bioinformatics
 # Biozentrum - University of Basel
 
-easyblock='MakeCp'
+easyblock = 'MakeCp'
 
 name = 'Bowtie2'
 version = '2.2.2'
@@ -17,12 +17,12 @@ description = """ Bowtie 2 is an ultrafast and memory-efficient tool for alignin
 
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 
-sources = ['%s-%s-source.zip' % (name.lower(), version)]
+sources = ['%(namelower)s-%(version)s-source.zip']
 source_urls = [('http://sourceforge.net/projects/bowtie-bio/files/%(namelower)s/%(version)s', 'download')]
 
 files_to_copy = [
     (["bowtie2", "bowtie2-align-l", "bowtie2-align-s", "bowtie2-build", "bowtie2-build-l", "bowtie2-build-s",
-     "bowtie2-inspect", "bowtie2-inspect-l", "bowtie2-inspect-s"], 'bin'),
+      "bowtie2-inspect", "bowtie2-inspect-l", "bowtie2-inspect-s"], 'bin'),
     "doc", "example", "scripts", "MANUAL", "MANUAL.markdown", "NEWS"]
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/b/Bowtie2/Bowtie2-2.2.4-goolf-1.4.10.eb b/easybuild/easyconfigs/b/Bowtie2/Bowtie2-2.2.4-goolf-1.4.10.eb
index 1a8d964de17d123d60c7f7124c483fdf31cde9f8..d2d24de2f8d4b4eac0c411832f82a7a4fc368771 100644
--- a/easybuild/easyconfigs/b/Bowtie2/Bowtie2-2.2.4-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/b/Bowtie2/Bowtie2-2.2.4-goolf-1.4.10.eb
@@ -24,7 +24,7 @@ source_urls = [('http://sourceforge.net/projects/bowtie-bio/files/%(namelower)s/
 
 files_to_copy = [
     (["bowtie2", "bowtie2-align-l", "bowtie2-align-s", "bowtie2-build", "bowtie2-build-l", "bowtie2-build-s",
-     "bowtie2-inspect", "bowtie2-inspect-l", "bowtie2-inspect-s"], 'bin'),
+      "bowtie2-inspect", "bowtie2-inspect-l", "bowtie2-inspect-s"], 'bin'),
     "doc", "example", "scripts", "MANUAL", "MANUAL.markdown", "NEWS"]
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/b/Bowtie2/Bowtie2-2.2.5-goolf-1.7.20.eb b/easybuild/easyconfigs/b/Bowtie2/Bowtie2-2.2.5-goolf-1.7.20.eb
index 30dfc1896056ea87807b8d7ae8625639c77340b0..3f05bda0e89e6fb5679cc28b22bd04e9bd1bd02a 100644
--- a/easybuild/easyconfigs/b/Bowtie2/Bowtie2-2.2.5-goolf-1.7.20.eb
+++ b/easybuild/easyconfigs/b/Bowtie2/Bowtie2-2.2.5-goolf-1.7.20.eb
@@ -24,7 +24,7 @@ source_urls = [('http://sourceforge.net/projects/bowtie-bio/files/%(namelower)s/
 
 files_to_copy = [
     (["bowtie2", "bowtie2-align-l", "bowtie2-align-s", "bowtie2-build", "bowtie2-build-l", "bowtie2-build-s",
-     "bowtie2-inspect", "bowtie2-inspect-l", "bowtie2-inspect-s"], 'bin'),
+      "bowtie2-inspect", "bowtie2-inspect-l", "bowtie2-inspect-s"], 'bin'),
     "doc", "example", "scripts", "MANUAL", "MANUAL.markdown", "NEWS"]
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/b/Bowtie2/Bowtie2-2.2.5-intel-2015a.eb b/easybuild/easyconfigs/b/Bowtie2/Bowtie2-2.2.5-intel-2015a.eb
index cc4bd53b3af195625813f229498639fa5e1f0202..d7856c8fa20670e694139de19c6d38b48ba02455 100644
--- a/easybuild/easyconfigs/b/Bowtie2/Bowtie2-2.2.5-intel-2015a.eb
+++ b/easybuild/easyconfigs/b/Bowtie2/Bowtie2-2.2.5-intel-2015a.eb
@@ -24,7 +24,7 @@ source_urls = [('http://sourceforge.net/projects/bowtie-bio/files/%(namelower)s/
 
 files_to_copy = [
     (["bowtie2", "bowtie2-align-l", "bowtie2-align-s", "bowtie2-build", "bowtie2-build-l", "bowtie2-build-s",
-     "bowtie2-inspect", "bowtie2-inspect-l", "bowtie2-inspect-s"], 'bin'),
+      "bowtie2-inspect", "bowtie2-inspect-l", "bowtie2-inspect-s"], 'bin'),
     "doc", "example", "scripts", "MANUAL", "MANUAL.markdown", "NEWS"]
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/b/Bowtie2/Bowtie2-2.2.6-foss-2015b.eb b/easybuild/easyconfigs/b/Bowtie2/Bowtie2-2.2.6-foss-2015b.eb
index 9b9219de67df50b72cb816860f5955cb8b4ede4e..a342fa3e4d18f5e43bb9baa634c6638afe1202b5 100644
--- a/easybuild/easyconfigs/b/Bowtie2/Bowtie2-2.2.6-foss-2015b.eb
+++ b/easybuild/easyconfigs/b/Bowtie2/Bowtie2-2.2.6-foss-2015b.eb
@@ -24,7 +24,7 @@ source_urls = [('http://sourceforge.net/projects/bowtie-bio/files/%(namelower)s/
 
 files_to_copy = [
     (["bowtie2", "bowtie2-align-l", "bowtie2-align-s", "bowtie2-build", "bowtie2-build-l", "bowtie2-build-s",
-     "bowtie2-inspect", "bowtie2-inspect-l", "bowtie2-inspect-s"], 'bin'),
+      "bowtie2-inspect", "bowtie2-inspect-l", "bowtie2-inspect-s"], 'bin'),
     "doc", "example", "scripts", "MANUAL", "MANUAL.markdown", "NEWS"]
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/b/Bowtie2/Bowtie2-2.2.6-intel-2015b.eb b/easybuild/easyconfigs/b/Bowtie2/Bowtie2-2.2.6-intel-2015b.eb
index 7fc6a11c7dd708d148b548edbc45f93374b37f56..3901df0ef725f4b10f4f9f78320d6d60dc52194d 100644
--- a/easybuild/easyconfigs/b/Bowtie2/Bowtie2-2.2.6-intel-2015b.eb
+++ b/easybuild/easyconfigs/b/Bowtie2/Bowtie2-2.2.6-intel-2015b.eb
@@ -24,7 +24,7 @@ source_urls = [('http://sourceforge.net/projects/bowtie-bio/files/%(namelower)s/
 
 files_to_copy = [
     (["bowtie2", "bowtie2-align-l", "bowtie2-align-s", "bowtie2-build", "bowtie2-build-l", "bowtie2-build-s",
-     "bowtie2-inspect", "bowtie2-inspect-l", "bowtie2-inspect-s"], 'bin'),
+      "bowtie2-inspect", "bowtie2-inspect-l", "bowtie2-inspect-s"], 'bin'),
     "doc", "example", "scripts", "MANUAL", "MANUAL.markdown", "NEWS"]
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/b/bbFTP/bbFTP-3.2.0-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/b/bbFTP/bbFTP-3.2.0-goalf-1.1.0-no-OFED.eb
index 523b1ad59c890fc436fdc2dd4f8354ffc1f94b1e..e14fa5b01a995808fb06ca06aa909ad5031b968f 100644
--- a/easybuild/easyconfigs/b/bbFTP/bbFTP-3.2.0-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/b/bbFTP/bbFTP-3.2.0-goalf-1.1.0-no-OFED.eb
@@ -32,8 +32,8 @@ start_dir = 'bbftpc'
 buildopts = "CC=$CC"
 
 sanity_check_paths = {
-                      'files': ['bin/bbftp'],
-                      'dirs': []
-                     }
+    'files': ['bin/bbftp'],
+    'dirs': []
+}
 
 moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/b/bbFTP/bbFTP-3.2.0-goolf-1.4.10.eb b/easybuild/easyconfigs/b/bbFTP/bbFTP-3.2.0-goolf-1.4.10.eb
index b3183258a9f80295b1c957ce8efcd3a5ca831c46..b334202a6e96232b6dfe91338ae915a5ba0b6f89 100644
--- a/easybuild/easyconfigs/b/bbFTP/bbFTP-3.2.0-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/b/bbFTP/bbFTP-3.2.0-goolf-1.4.10.eb
@@ -32,8 +32,8 @@ start_dir = 'bbftpc'
 buildopts = "CC=$CC"
 
 sanity_check_paths = {
-                      'files': ['bin/bbftp'],
-                      'dirs': []
-                     }
+    'files': ['bin/bbftp'],
+    'dirs': []
+}
 
 moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/b/bbcp/bbcp-12.01.30.00.0-amd64_linux26.eb b/easybuild/easyconfigs/b/bbcp/bbcp-12.01.30.00.0-amd64_linux26.eb
index 81abdbbdb7a70590486c2ce06adedfb3725f5658..17f6d6b14b75f8bf83b8e758f071c5f6cdf7c2c4 100644
--- a/easybuild/easyconfigs/b/bbcp/bbcp-12.01.30.00.0-amd64_linux26.eb
+++ b/easybuild/easyconfigs/b/bbcp/bbcp-12.01.30.00.0-amd64_linux26.eb
@@ -35,4 +35,3 @@ sanity_check_paths = {
 }
 
 moduleclass = 'tools'
-
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 ead21fe6c829ba2ee658ba9ce9b7b05f5096ddc5..eae65e841feebf52f18713680922db8fda1b02fe 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,13 +24,13 @@ 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'
 
 sanity_check_paths = {
-                      'files': ['bin/bbftp'],
-                      'dirs': []
-                     }
+    'files': ['bin/bbftp'],
+    'dirs': []
+}
 
 moduleclass = 'tools'
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 944cb25b8bd84727a98122f274893e0345dac5cc..29c92454a67925ec51a70d260a2a45927080c2fd 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,13 +24,13 @@ 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'
 
 sanity_check_paths = {
-                      'files': ['bin/bbftp'],
-                      'dirs': []
-                     }
+    'files': ['bin/bbftp'],
+    'dirs': []
+}
 
 moduleclass = 'tools'
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 8cff88ba262c030c07a9ce88173590f02b1643bf..21a811ccbf3b82bc5d5d44f00bf11e082897a54c 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/bc/bc-1.06.95-GCC-4.8.2.eb b/easybuild/easyconfigs/b/bc/bc-1.06.95-GCC-4.8.2.eb
index 1d80e71daeeb30231fadbcdd9164da0eeed98815..3755390098030c7018e2ecf4abaecb193d0d859c 100644
--- a/easybuild/easyconfigs/b/bc/bc-1.06.95-GCC-4.8.2.eb
+++ b/easybuild/easyconfigs/b/bc/bc-1.06.95-GCC-4.8.2.eb
@@ -17,12 +17,12 @@ sources = [SOURCELOWER_TAR_BZ2]
 toolchain = {'name': 'GCC', 'version': '4.8.2'}
 
 dependencies = [
-    ('libreadline','6.3'),
-    ('flex','2.5.38'),
-    ('Bison','3.0.2'),
+    ('libreadline', '6.3'),
+    ('flex', '2.5.38'),
+    ('Bison', '3.0.2'),
 ]
 builddependencies = [
-    ('texinfo','5.2'),
+    ('texinfo', '5.2'),
 ]
 
 configopts = ['--with-readline']
diff --git a/easybuild/easyconfigs/b/beagle-lib/beagle-lib-20120124-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/b/beagle-lib/beagle-lib-20120124-goalf-1.1.0-no-OFED.eb
index 8cc9ec017ec78c1bef9a859ec5ca8b03896d3a65..0165eeb65336ce9d9088b01468450bebfcf1fabb 100644
--- a/easybuild/easyconfigs/b/beagle-lib/beagle-lib-20120124-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/b/beagle-lib/beagle-lib-20120124-goalf-1.1.0-no-OFED.eb
@@ -26,8 +26,8 @@ sanity_check_paths = {
     'files': ["include/libhmsbeagle-1/libhmsbeagle/%s" % includefile
               for includefile in ["beagle.h", "platform.h"]] +
              ["lib/libhmsbeagle%s.so" % libfile
-              for libfile in ["-cpu", "-cpu-sse", "-jni" ,""]],
-    'dirs' : []
+              for libfile in ["-cpu", "-cpu-sse", "-jni", ""]],
+    'dirs': []
 }
 
 moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/b/beagle-lib/beagle-lib-20120124-goolf-1.4.10.eb b/easybuild/easyconfigs/b/beagle-lib/beagle-lib-20120124-goolf-1.4.10.eb
index 6ce8bc4c642722e89ff8fcdbb5f2d073d21f9b1b..f54d71284a0c2819be918438a6c9390388fe7dba 100644
--- a/easybuild/easyconfigs/b/beagle-lib/beagle-lib-20120124-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/b/beagle-lib/beagle-lib-20120124-goolf-1.4.10.eb
@@ -27,8 +27,8 @@ sanity_check_paths = {
     'files': ["include/libhmsbeagle-1/libhmsbeagle/%s" % includefile
               for includefile in ["beagle.h", "platform.h"]] +
              ["lib/libhmsbeagle%s.so" % libfile
-              for libfile in ["-cpu", "-cpu-sse", "-jni" ,""]],
-    'dirs' : []
+              for libfile in ["-cpu", "-cpu-sse", "-jni", ""]],
+    'dirs': []
 }
 
 moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/b/beagle-lib/beagle-lib-20120124-ictce-4.0.6.eb b/easybuild/easyconfigs/b/beagle-lib/beagle-lib-20120124-ictce-4.0.6.eb
index 1a9b8e86f18277dd2ae2a7e88b4b3b6ca01b6b38..55504df755bc1f00c058ae1a90fbdaaf6ec9b92a 100644
--- a/easybuild/easyconfigs/b/beagle-lib/beagle-lib-20120124-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/b/beagle-lib/beagle-lib-20120124-ictce-4.0.6.eb
@@ -23,8 +23,8 @@ sanity_check_paths = {
     'files': ["include/libhmsbeagle-1/libhmsbeagle/%s" % includefile
               for includefile in ["beagle.h", "platform.h"]] +
              ["lib/libhmsbeagle%s.so" % libfile
-              for libfile in ["-cpu", "-cpu-sse", "-jni" ,""]],
-    'dirs' : []
+              for libfile in ["-cpu", "-cpu-sse", "-jni", ""]],
+    'dirs': []
 }
 
 moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/b/beagle-lib/beagle-lib-20120124-ictce-5.3.0.eb b/easybuild/easyconfigs/b/beagle-lib/beagle-lib-20120124-ictce-5.3.0.eb
index 971aefa649680e1c68953d04ff39c24c8c751b04..d4fc0c8fee561bf2c77355aa43b26c92242d14a8 100644
--- a/easybuild/easyconfigs/b/beagle-lib/beagle-lib-20120124-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/b/beagle-lib/beagle-lib-20120124-ictce-5.3.0.eb
@@ -23,8 +23,8 @@ sanity_check_paths = {
     'files': ["include/libhmsbeagle-1/libhmsbeagle/%s" % includefile
               for includefile in ["beagle.h", "platform.h"]] +
              ["lib/libhmsbeagle%s.so" % libfile
-              for libfile in ["-cpu", "-cpu-sse", "-jni" ,""]],
-    'dirs' : []
+              for libfile in ["-cpu", "-cpu-sse", "-jni", ""]],
+    'dirs': []
 }
 
 moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/b/beagle-lib/beagle-lib-20141202-intel-2015a.eb b/easybuild/easyconfigs/b/beagle-lib/beagle-lib-20141202-intel-2015a.eb
index 6958ac722420b20782fd3291599c15934ff01969..cc7febf444602efa1700606a61d32d29d50923b5 100644
--- a/easybuild/easyconfigs/b/beagle-lib/beagle-lib-20141202-intel-2015a.eb
+++ b/easybuild/easyconfigs/b/beagle-lib/beagle-lib-20141202-intel-2015a.eb
@@ -1,7 +1,7 @@
 easyblock = 'ConfigureMake'
 
 name = 'beagle-lib'
-#revision r1261
+# revision r1261
 version = '20141202'
 
 homepage = 'http://code.google.com/p/beagle-lib/'
@@ -29,8 +29,8 @@ sanity_check_paths = {
     'files': ["include/libhmsbeagle-1/libhmsbeagle/%s" % includefile
               for includefile in ["beagle.h", "platform.h"]] +
              ["lib/libhmsbeagle%s.so" % libfile
-              for libfile in ["-cpu", "-cpu-sse", "-jni" ,""]],
-    'dirs' : []
+              for libfile in ["-cpu", "-cpu-sse", "-jni", ""]],
+    'dirs': []
 }
 
 moduleclass = 'numlib'
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 89688dc6f162fb51c9d97b4b65879850816f5517..bfc339020fbd2b5f416984daa12cbb53c402e10f 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
@@ -28,7 +28,7 @@ source_urls = [GNU_SOURCE]
 configopts = '--with-sysroot=/'
 
 binlist = ['addr2line', 'ar', 'as', 'c++filt', 'elfedit', 'gprof', 'ld', 'ld.bfd', 'nm',
-           'objcopy', 'objdump', 'ranlib', 'readelf', 'size', 'strings', 'strip' ]
+           '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'] +
              ['include/%s' % x for x in ['ansidecl.h', 'bfd.h', 'bfdlink.h', 'dis-asm.h', 'symcat.h']],
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 fc3ab9230d42fa6c50ea123286c427849ef9df70..437f04c2a6fc8e9622950e760f51e26a99b1a307 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
@@ -28,7 +28,7 @@ source_urls = [GNU_SOURCE]
 configopts = '--with-sysroot=/'
 
 binlist = ['addr2line', 'ar', 'as', 'c++filt', 'elfedit', 'gprof', 'ld', 'ld.bfd', 'nm',
-           'objcopy', 'objdump', 'ranlib', 'readelf', 'size', 'strings', 'strip' ]
+           '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'] +
              ['include/%s' % x for x in ['ansidecl.h', 'bfd.h', 'bfdlink.h', 'dis-asm.h', 'symcat.h']],
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 10612dc9735f4d71eda671b018ae93a7c1235582..5f76d89a06764d873b39e83f81320f12e7e8f66c 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
@@ -27,7 +27,7 @@ source_urls = [GNU_SOURCE]
 configopts = '--with-sysroot=/'
 
 binlist = ['addr2line', 'ar', 'as', 'c++filt', 'elfedit', 'gprof', 'ld', 'ld.bfd', 'nm',
-           'objcopy', 'objdump', 'ranlib', 'readelf', 'size', 'strings', 'strip' ]
+           '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'] +
              ['include/%s' % x for x in ['ansidecl.h', 'bfd.h', 'bfdlink.h', 'dis-asm.h', 'symcat.h']],
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 f0f82557eb08c19273790361bdc14d0f7d04dfb4..5dae8ebe27dc03e4c75dc3c7bdc380e8e2823f76 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
@@ -25,7 +25,7 @@ sources = ['binutils-%(version)s.tar.bz2']
 source_urls = [GNU_SOURCE]
 
 binlist = ['addr2line', 'ar', 'as', 'c++filt', 'elfedit', 'gprof', 'ld', 'ld.bfd', 'nm',
-           'objcopy', 'objdump', 'ranlib', 'readelf', 'size', 'strings', 'strip' ]
+           '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'] +
              ['include/%s' % x for x in ['ansidecl.h', 'bfd.h', 'bfdlink.h', 'dis-asm.h', 'symcat.h']],
diff --git a/easybuild/easyconfigs/b/binutils/binutils-2.24-foss-2014b.eb b/easybuild/easyconfigs/b/binutils/binutils-2.24-foss-2014b.eb
index f289f62f1b1330c3bf3ce51084f8544a58850083..3d49fdcf03a6d201b6de0aaad2b6fb363160402d 100644
--- a/easybuild/easyconfigs/b/binutils/binutils-2.24-foss-2014b.eb
+++ b/easybuild/easyconfigs/b/binutils/binutils-2.24-foss-2014b.eb
@@ -19,7 +19,7 @@ dependencies = [
 configopts = '--with-sysroot=/'
 
 binlist = ['addr2line', 'ar', 'as', 'c++filt', 'elfedit', 'gprof', 'ld', 'ld.bfd', 'nm',
-           'objcopy', 'objdump', 'ranlib', 'readelf', 'size', 'strings', 'strip' ]
+           'objcopy', 'objdump', 'ranlib', 'readelf', 'size', 'strings', 'strip']
 sanity_check_paths = {
     'files': ['bin/%s' % x for x in binlist] + ['lib/libbfd.a', 'lib/libopcodes.a'] +
              ['include/%s' % x for x in ['ansidecl.h', 'bfd.h', 'bfdlink.h', 'dis-asm.h', 'symcat.h']],
diff --git a/easybuild/easyconfigs/b/binutils/binutils-2.24-intel-2014b.eb b/easybuild/easyconfigs/b/binutils/binutils-2.24-intel-2014b.eb
index 90ee55811f8d090738cd56b78eb71cd0f1a755b3..77fb03962bf0ff81f50096e33d3cc63e99def20f 100644
--- a/easybuild/easyconfigs/b/binutils/binutils-2.24-intel-2014b.eb
+++ b/easybuild/easyconfigs/b/binutils/binutils-2.24-intel-2014b.eb
@@ -22,7 +22,7 @@ configopts = '--with-sysroot=/'
 buildopts = 'CFLAGS="$CFLAGS -wd175"'
 
 binlist = ['addr2line', 'ar', 'as', 'c++filt', 'elfedit', 'gprof', 'ld', 'ld.bfd', 'nm',
-           'objcopy', 'objdump', 'ranlib', 'readelf', 'size', 'strings', 'strip' ]
+           'objcopy', 'objdump', 'ranlib', 'readelf', 'size', 'strings', 'strip']
 sanity_check_paths = {
     'files': ['bin/%s' % x for x in binlist] + ['lib/libbfd.a', 'lib/libopcodes.a'] +
              ['include/%s' % x for x in ['ansidecl.h', 'bfd.h', 'bfdlink.h', 'dis-asm.h', 'symcat.h']],
diff --git a/easybuild/easyconfigs/b/binutils/binutils-2.25-GCC-4.9.2-binutils-2.25.eb b/easybuild/easyconfigs/b/binutils/binutils-2.25-GCC-4.9.2-binutils-2.25.eb
index 9ceff3cb2cf36ea08aaf319e494969e9f8a0231b..608c44a15521cde30eec5ba9c49943893f9c0e17 100644
--- a/easybuild/easyconfigs/b/binutils/binutils-2.25-GCC-4.9.2-binutils-2.25.eb
+++ b/easybuild/easyconfigs/b/binutils/binutils-2.25-GCC-4.9.2-binutils-2.25.eb
@@ -29,7 +29,7 @@ prebuildopts = 'LIBS="$EBROOTZLIB/lib/libz.a"'
 configopts = '--with-sysroot=/ --enable-gold --enable-ld=default --enable-plugins --enable-shared --enable-static'
 
 binlist = ['addr2line', 'ar', 'as', 'c++filt', 'elfedit', 'gprof', 'ld', 'ld.bfd', 'ld.gold', 'nm',
-           'objcopy', 'objdump', 'ranlib', 'readelf', 'size', 'strings', 'strip' ]
+           'objcopy', 'objdump', 'ranlib', 'readelf', 'size', 'strings', 'strip']
 
 sanity_check_paths = {
     'files': ['bin/%s' % x for x in binlist] +
diff --git a/easybuild/easyconfigs/b/binutils/binutils-2.25-GCC-4.9.2.eb b/easybuild/easyconfigs/b/binutils/binutils-2.25-GCC-4.9.2.eb
index f62c14d803dd17792a7d85cb3cce0740af414637..17ecd5c19008a011fb0180ea8bc6f8c4d342ab97 100644
--- a/easybuild/easyconfigs/b/binutils/binutils-2.25-GCC-4.9.2.eb
+++ b/easybuild/easyconfigs/b/binutils/binutils-2.25-GCC-4.9.2.eb
@@ -28,7 +28,7 @@ prebuildopts = 'LIBS="$EBROOTZLIB/lib/libz.a"'
 configopts = '--with-sysroot=/ --enable-gold --enable-ld=default --enable-plugins --enable-shared --enable-static'
 
 binlist = ['addr2line', 'ar', 'as', 'c++filt', 'elfedit', 'gprof', 'ld', 'ld.bfd', 'ld.gold', 'nm',
-           'objcopy', 'objdump', 'ranlib', 'readelf', 'size', 'strings', 'strip' ]
+           'objcopy', 'objdump', 'ranlib', 'readelf', 'size', 'strings', 'strip']
 
 sanity_check_paths = {
     'files': ['bin/%s' % x for x in binlist] +
diff --git a/easybuild/easyconfigs/b/binutils/binutils-2.25-GCC-4.9.3-binutils-2.25.eb b/easybuild/easyconfigs/b/binutils/binutils-2.25-GCC-4.9.3-binutils-2.25.eb
index 6d5e96c3f745fc1ae2788efd4f1db3f6bb179e89..61254037e0396e5d63659b3e4c854e5aacb3403e 100644
--- a/easybuild/easyconfigs/b/binutils/binutils-2.25-GCC-4.9.3-binutils-2.25.eb
+++ b/easybuild/easyconfigs/b/binutils/binutils-2.25-GCC-4.9.3-binutils-2.25.eb
@@ -29,7 +29,7 @@ prebuildopts = 'LIBS="$EBROOTZLIB/lib/libz.a"'
 configopts = '--with-sysroot=/ --enable-gold --enable-ld=default --enable-plugins --enable-shared --enable-static'
 
 binlist = ['addr2line', 'ar', 'as', 'c++filt', 'elfedit', 'gprof', 'ld', 'ld.bfd', 'ld.gold', 'nm',
-           'objcopy', 'objdump', 'ranlib', 'readelf', 'size', 'strings', 'strip' ]
+           'objcopy', 'objdump', 'ranlib', 'readelf', 'size', 'strings', 'strip']
 
 sanity_check_paths = {
     'files': ['bin/%s' % x for x in binlist] +
diff --git a/easybuild/easyconfigs/b/binutils/binutils-2.25-GCC-4.9.3.eb b/easybuild/easyconfigs/b/binutils/binutils-2.25-GCC-4.9.3.eb
index 36bd18b1aeef6d8aa545148451b7e15dd3c2e6cc..0007322f1fb51af25c3045f33ec9ce537e831076 100644
--- a/easybuild/easyconfigs/b/binutils/binutils-2.25-GCC-4.9.3.eb
+++ b/easybuild/easyconfigs/b/binutils/binutils-2.25-GCC-4.9.3.eb
@@ -28,7 +28,7 @@ prebuildopts = 'LIBS="$EBROOTZLIB/lib/libz.a"'
 configopts = '--with-sysroot=/ --enable-gold --enable-ld=default --enable-plugins --enable-shared --enable-static'
 
 binlist = ['addr2line', 'ar', 'as', 'c++filt', 'elfedit', 'gprof', 'ld', 'ld.bfd', 'ld.gold', 'nm',
-           'objcopy', 'objdump', 'ranlib', 'readelf', 'size', 'strings', 'strip' ]
+           'objcopy', 'objdump', 'ranlib', 'readelf', 'size', 'strings', 'strip']
 
 sanity_check_paths = {
     'files': ['bin/%s' % x for x in binlist] +
diff --git a/easybuild/easyconfigs/b/binutils/binutils-2.25-GCC-5.1.0-binutils-2.25.eb b/easybuild/easyconfigs/b/binutils/binutils-2.25-GCC-5.1.0-binutils-2.25.eb
index e24f90d2ed20a9fc04f8c6e8458a4c0263091a1e..e6f5a84c78781fe6e551cdee1befa1c521116c05 100644
--- a/easybuild/easyconfigs/b/binutils/binutils-2.25-GCC-5.1.0-binutils-2.25.eb
+++ b/easybuild/easyconfigs/b/binutils/binutils-2.25-GCC-5.1.0-binutils-2.25.eb
@@ -29,7 +29,7 @@ prebuildopts = 'LIBS="$EBROOTZLIB/lib/libz.a"'
 configopts = '--with-sysroot=/ --enable-gold --enable-ld=default --enable-plugins --enable-shared --enable-static'
 
 binlist = ['addr2line', 'ar', 'as', 'c++filt', 'elfedit', 'gprof', 'ld', 'ld.bfd', 'ld.gold', 'nm',
-           'objcopy', 'objdump', 'ranlib', 'readelf', 'size', 'strings', 'strip' ]
+           'objcopy', 'objdump', 'ranlib', 'readelf', 'size', 'strings', 'strip']
 
 sanity_check_paths = {
     'files': ['bin/%s' % x for x in binlist] +
diff --git a/easybuild/easyconfigs/b/binutils/binutils-2.25-GCCcore-4.9.3.eb b/easybuild/easyconfigs/b/binutils/binutils-2.25-GCCcore-4.9.3.eb
index 77644355ad6b3b9bf06d4cc09f112b649167c1d5..5fcc8fc6b3b23886cbde2b48fc3bfb7a3b31c3fa 100644
--- a/easybuild/easyconfigs/b/binutils/binutils-2.25-GCCcore-4.9.3.eb
+++ b/easybuild/easyconfigs/b/binutils/binutils-2.25-GCCcore-4.9.3.eb
@@ -29,7 +29,7 @@ prebuildopts = 'LIBS="$EBROOTZLIB/lib/libz.a"'
 configopts = '--with-sysroot=/ --enable-gold --enable-ld=default --enable-plugins  --enable-shared --enable-static'
 
 binlist = ['addr2line', 'ar', 'as', 'c++filt', 'elfedit', 'gprof', 'ld', 'ld.bfd', 'ld.gold', 'nm',
-           'objcopy', 'objdump', 'ranlib', 'readelf', 'size', 'strings', 'strip' ]
+           'objcopy', 'objdump', 'ranlib', 'readelf', 'size', 'strings', 'strip']
 
 sanity_check_paths = {
     'files': ['bin/%s' % x for x in binlist] +
diff --git a/easybuild/easyconfigs/b/binutils/binutils-2.25.1.eb b/easybuild/easyconfigs/b/binutils/binutils-2.25.1.eb
index 6e4fce3123e5d5efff2806542abb7f09fad1c6cf..b6d188a41b1513a8888fb8e9b020022b67894154 100644
--- a/easybuild/easyconfigs/b/binutils/binutils-2.25.1.eb
+++ b/easybuild/easyconfigs/b/binutils/binutils-2.25.1.eb
@@ -29,7 +29,7 @@ prebuildopts = preconfigopts
 configopts = '--with-sysroot=/ --enable-gold --enable-ld=default --enable-plugins'
 
 binlist = ['addr2line', 'ar', 'as', 'c++filt', 'elfedit', 'gprof', 'ld', 'ld.bfd', 'ld.gold', 'nm',
-           'objcopy', 'objdump', 'ranlib', 'readelf', 'size', 'strings', 'strip' ]
+           'objcopy', 'objdump', 'ranlib', 'readelf', 'size', 'strings', 'strip']
 sanity_check_paths = {
     'files': ['bin/%s' % x for x in binlist] + ['lib/libbfd.a', 'lib/libopcodes.a'] +
              ['include/%s' % x for x in ['ansidecl.h', 'bfd.h', 'bfdlink.h', 'dis-asm.h', 'symcat.h']],
diff --git a/easybuild/easyconfigs/b/binutils/binutils-2.25.eb b/easybuild/easyconfigs/b/binutils/binutils-2.25.eb
index 12add4fe48ddedd70aeba43ad1227d44fe0e33c2..3a95cee4b62c2bf044d66a8974170ed3d5213ea0 100644
--- a/easybuild/easyconfigs/b/binutils/binutils-2.25.eb
+++ b/easybuild/easyconfigs/b/binutils/binutils-2.25.eb
@@ -29,7 +29,7 @@ prebuildopts = preconfigopts
 configopts = '--with-sysroot=/ --enable-gold --enable-ld=default --enable-plugins'
 
 binlist = ['addr2line', 'ar', 'as', 'c++filt', 'elfedit', 'gprof', 'ld', 'ld.bfd', 'ld.gold', 'nm',
-           'objcopy', 'objdump', 'ranlib', 'readelf', 'size', 'strings', 'strip' ]
+           'objcopy', 'objdump', 'ranlib', 'readelf', 'size', 'strings', 'strip']
 sanity_check_paths = {
     'files': ['bin/%s' % x for x in binlist] + ['lib/libbfd.a', 'lib/libopcodes.a'] +
              ['include/%s' % x for x in ['ansidecl.h', 'bfd.h', 'bfdlink.h', 'dis-asm.h', 'symcat.h']],
diff --git a/easybuild/easyconfigs/b/byacc/byacc-20120526-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/b/byacc/byacc-20120526-goalf-1.1.0-no-OFED.eb
index 42ae4e574e029307a140ffbae9ca690566478a09..17776b5889715157c07f957ad8d5034a0a0df4c7 100644
--- a/easybuild/easyconfigs/b/byacc/byacc-20120526-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/b/byacc/byacc-20120526-goalf-1.1.0-no-OFED.eb
@@ -13,8 +13,8 @@ sources = [SOURCELOWER_TGZ]
 source_urls = ['ftp://invisible-island.net/byacc']
 
 sanity_check_paths = {
-                      'files': ["bin/yacc"],
-                      'dirs': []
-                     }
+    'files': ["bin/yacc"],
+    'dirs': []
+}
 
 moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/b/byacc/byacc-20120526-goolf-1.4.10.eb b/easybuild/easyconfigs/b/byacc/byacc-20120526-goolf-1.4.10.eb
index f53938591a3fffaa81bf039089e6b6206bcb7b02..9a479b92a1c733d537272072ba0cbe9084bdbebd 100644
--- a/easybuild/easyconfigs/b/byacc/byacc-20120526-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/b/byacc/byacc-20120526-goolf-1.4.10.eb
@@ -13,8 +13,8 @@ sources = [SOURCELOWER_TGZ]
 source_urls = ['ftp://invisible-island.net/byacc']
 
 sanity_check_paths = {
-                      'files': ["bin/yacc"],
-                      'dirs': []
-                     }
+    'files': ["bin/yacc"],
+    'dirs': []
+}
 
 moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/b/byacc/byacc-20120526-ictce-4.0.6.eb b/easybuild/easyconfigs/b/byacc/byacc-20120526-ictce-4.0.6.eb
index b2e4ab6e2443e27bae4784d9329a0407d905ec61..5112bff567d49f121872dc77c5c424c18d2ff674 100644
--- a/easybuild/easyconfigs/b/byacc/byacc-20120526-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/b/byacc/byacc-20120526-ictce-4.0.6.eb
@@ -7,14 +7,14 @@ homepage = 'http://invisible-island.net/byacc/byacc.html'
 description = """Berkeley Yacc (byacc) is generally conceded to be the best yacc variant available.
  In contrast to bison, it is written to avoid dependencies upon a particular compiler."""
 
-toolchain = {'name': 'ictce', 'version' : '4.0.6'}
+toolchain = {'name': 'ictce', 'version': '4.0.6'}
 
 sources = [SOURCELOWER_TGZ]
 source_urls = ['ftp://invisible-island.net/byacc']
 
 sanity_check_paths = {
-                      'files': ["bin/yacc"],
-                      'dirs': []
-                     }
+    'files': ["bin/yacc"],
+    'dirs': []
+}
 
 moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/b/byacc/byacc-20120526-ictce-5.3.0.eb b/easybuild/easyconfigs/b/byacc/byacc-20120526-ictce-5.3.0.eb
index 39def10fe537b29379e113a14a85885aa2bb074a..2dcca844dd76272220274b909d56014c7e288eea 100644
--- a/easybuild/easyconfigs/b/byacc/byacc-20120526-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/b/byacc/byacc-20120526-ictce-5.3.0.eb
@@ -14,8 +14,8 @@ sources = [SOURCELOWER_TGZ]
 source_urls = ['ftp://invisible-island.net/byacc']
 
 sanity_check_paths = {
-                      'files': ["bin/yacc"],
-                      'dirs': []
-                     }
+    'files': ["bin/yacc"],
+    'dirs': []
+}
 
 moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/b/byacc/byacc-20150711-foss-2015b.eb b/easybuild/easyconfigs/b/byacc/byacc-20150711-foss-2015b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..6fabc38da754c3d9b904ec0fc41bf4ef83c9b059
--- /dev/null
+++ b/easybuild/easyconfigs/b/byacc/byacc-20150711-foss-2015b.eb
@@ -0,0 +1,22 @@
+easyblock = 'ConfigureMake'
+
+name = 'byacc'
+version = '20150711'
+
+homepage = 'http://invisible-island.net/byacc/byacc.html'
+description = """Berkeley Yacc (byacc) is generally conceded to be the best yacc variant available.
+ In contrast to bison, it is written to avoid dependencies upon a particular compiler."""
+
+toolchain = {'name': 'foss', 'version': '2015b'}
+
+sources = [SOURCELOWER_TGZ]
+source_urls = ['ftp://invisible-island.net/byacc']
+
+checksums = ['2700401030583c4e9169ac7ea7d08de8']
+
+sanity_check_paths = {
+    'files': ["bin/yacc"],
+    'dirs': []
+}
+
+moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/b/byacc/byacc-20150711-intel-2015b.eb b/easybuild/easyconfigs/b/byacc/byacc-20150711-intel-2015b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..1578ff69e4f7972f16a93369dcc3a5bbfce4ea63
--- /dev/null
+++ b/easybuild/easyconfigs/b/byacc/byacc-20150711-intel-2015b.eb
@@ -0,0 +1,22 @@
+easyblock = 'ConfigureMake'
+
+name = 'byacc'
+version = '20150711'
+
+homepage = 'http://invisible-island.net/byacc/byacc.html'
+description = """Berkeley Yacc (byacc) is generally conceded to be the best yacc variant available.
+ In contrast to bison, it is written to avoid dependencies upon a particular compiler."""
+
+toolchain = {'name': 'intel', 'version': '2015b'}
+
+sources = [SOURCELOWER_TGZ]
+source_urls = ['ftp://invisible-island.net/byacc']
+
+checksums = ['2700401030583c4e9169ac7ea7d08de8']
+
+sanity_check_paths = {
+    'files': ["bin/yacc"],
+    'dirs': []
+}
+
+moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/b/bzip2/bzip2-1.0.6-ictce-5.4.0.eb b/easybuild/easyconfigs/b/bzip2/bzip2-1.0.6-ictce-5.4.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..705ab72be8f5762c64884a5a6a08f62fd8be9233
--- /dev/null
+++ b/easybuild/easyconfigs/b/bzip2/bzip2-1.0.6-ictce-5.4.0.eb
@@ -0,0 +1,16 @@
+name = 'bzip2'
+version = '1.0.6'
+
+homepage = 'http://www.bzip.org/'
+description = """bzip2 is a freely available, patent free, high-quality data compressor. It typically
+ compresses files to within 10% to 15% of the best available techniques (the PPM family of statistical
+ compressors), whilst being around twice as fast at compression and six times faster at decompression."""
+
+
+toolchain = {'name': 'ictce', 'version': '5.4.0'}
+toolchainopts = {'pic': True}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = ['http://www.bzip.org/%(version)s']
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/c/CAP3/CAP3-20071221-intel-x86.eb b/easybuild/easyconfigs/c/CAP3/CAP3-20071221-intel-x86.eb
index 0c1d5284b7d1f404efa4a56f504997b58f1e4a2f..98b5be9cc78104fcdcdca7b768973005f38233f5 100644
--- a/easybuild/easyconfigs/c/CAP3/CAP3-20071221-intel-x86.eb
+++ b/easybuild/easyconfigs/c/CAP3/CAP3-20071221-intel-x86.eb
@@ -19,7 +19,7 @@ sources = ['cap3.linux.tar']
 checksums = [('md5', '55f57f61e588d4de06c0506cf2696c29')]
 
 sanity_check_paths = {
-    'files': ['cap3','formcon'],
+    'files': ['cap3', 'formcon'],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/c/CAP3/CAP3-20071221-intel-x86_64.eb b/easybuild/easyconfigs/c/CAP3/CAP3-20071221-intel-x86_64.eb
index 0962339a29006078cbdb5f8d49324496a3e56d4f..a459a2b2ae817c1829419c3efd282589efc658e0 100644
--- a/easybuild/easyconfigs/c/CAP3/CAP3-20071221-intel-x86_64.eb
+++ b/easybuild/easyconfigs/c/CAP3/CAP3-20071221-intel-x86_64.eb
@@ -19,7 +19,7 @@ sources = ['cap3.linux.x86_64.tar']
 checksums = [('md5', '0fbb95c3fcbfb2b1afcebc5f7e2b4343')]
 
 sanity_check_paths = {
-    'files': ['cap3','formcon'],
+    'files': ['cap3', 'formcon'],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/c/CAP3/CAP3-20071221-opteron.eb b/easybuild/easyconfigs/c/CAP3/CAP3-20071221-opteron.eb
index 3e19f30c4910fbe108d6d3e94b39f65eea4e41f9..574d59a93d86de55fe22ee843905e6cbee0bf4c7 100644
--- a/easybuild/easyconfigs/c/CAP3/CAP3-20071221-opteron.eb
+++ b/easybuild/easyconfigs/c/CAP3/CAP3-20071221-opteron.eb
@@ -19,7 +19,7 @@ sources = ['cap3.linux.opteron64.tar']
 checksums = [('md5', '2d924766f6e8b5cf03bd2db81016d821')]
 
 sanity_check_paths = {
-    'files': ['cap3','formcon'],
+    'files': ['cap3', 'formcon'],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/c/CCfits/CCfits-2.4-goolf-1.4.10.eb b/easybuild/easyconfigs/c/CCfits/CCfits-2.4-goolf-1.4.10.eb
index d575fbe8958d94bb0deeaf2c2e962dbb64e609d7..587da5f4ecd109a7eeec26e1b069f37ee6582c25 100644
--- a/easybuild/easyconfigs/c/CCfits/CCfits-2.4-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/c/CCfits/CCfits-2.4-goolf-1.4.10.eb
@@ -13,7 +13,7 @@ toolchainopts = {'optarch': True, 'pic': True}
 source_urls = ['http://heasarc.gsfc.nasa.gov/fitsio/CCfits/']
 sources = [SOURCE_TAR_GZ]
 
-dependencies = [('CFITSIO','3.34')]
+dependencies = [('CFITSIO', '3.34')]
 
 sanity_check_paths = {
     'files': ['bin/cookbook', 'lib/libCCfits.%s' % SHLIB_EXT, 'lib/pkgconfig/CCfits.pc'],
diff --git a/easybuild/easyconfigs/c/CCfits/CCfits-2.4-ictce-4.1.13.eb b/easybuild/easyconfigs/c/CCfits/CCfits-2.4-ictce-4.1.13.eb
index 3375f207b28fe58286e1db89d358790e097b4fcb..1c12c8c026c06068a3986099c7fb7329c29fe6a6 100644
--- a/easybuild/easyconfigs/c/CCfits/CCfits-2.4-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/c/CCfits/CCfits-2.4-ictce-4.1.13.eb
@@ -13,7 +13,7 @@ toolchainopts = {'optarch': True, 'pic': True}
 source_urls = ['http://heasarc.gsfc.nasa.gov/fitsio/CCfits/']
 sources = [SOURCE_TAR_GZ]
 
-dependencies = [('CFITSIO','3.34')]
+dependencies = [('CFITSIO', '3.34')]
 
 sanity_check_paths = {
     'files': ['bin/cookbook', 'lib/libCCfits.%s' % SHLIB_EXT, 'lib/pkgconfig/CCfits.pc'],
diff --git a/easybuild/easyconfigs/c/CCfits/CCfits-2.4-ictce-5.3.0.eb b/easybuild/easyconfigs/c/CCfits/CCfits-2.4-ictce-5.3.0.eb
index a344cd2ac08de17022f790c32cce505fbcae9b67..15a5ec31e9759a3c84ad754a5b6d445a54dd51e3 100644
--- a/easybuild/easyconfigs/c/CCfits/CCfits-2.4-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/c/CCfits/CCfits-2.4-ictce-5.3.0.eb
@@ -13,7 +13,7 @@ toolchainopts = {'optarch': True, 'pic': True}
 source_urls = ['http://heasarc.gsfc.nasa.gov/fitsio/CCfits/']
 sources = [SOURCE_TAR_GZ]
 
-dependencies = [('CFITSIO','3.34')]
+dependencies = [('CFITSIO', '3.34')]
 
 sanity_check_paths = {
     'files': ['bin/cookbook', 'lib/libCCfits.%s' % SHLIB_EXT, 'lib/pkgconfig/CCfits.pc'],
diff --git a/easybuild/easyconfigs/c/CD-HIT/CD-HIT-4.5.4-ictce-5.3.0-2011-03-07.eb b/easybuild/easyconfigs/c/CD-HIT/CD-HIT-4.5.4-ictce-5.3.0-2011-03-07.eb
index 5c78fcfbe54f45c0514ab1f6b99dde2293080bc7..e4650118de675db9f57e90048e7625a2119ef569 100644
--- a/easybuild/easyconfigs/c/CD-HIT/CD-HIT-4.5.4-ictce-5.3.0-2011-03-07.eb
+++ b/easybuild/easyconfigs/c/CD-HIT/CD-HIT-4.5.4-ictce-5.3.0-2011-03-07.eb
@@ -11,7 +11,7 @@ easyblock = "MakeCp"
 
 name = 'CD-HIT'
 version = '4.5.4'
-versionsuffix='-2011-03-07'
+versionsuffix = '-2011-03-07'
 
 homepage = 'http://www.bioinformatics.org/cd-hit/'
 description = """CD-HIT stands for Cluster Database at High Identity with Tolerance. The program 
diff --git a/easybuild/easyconfigs/c/CD-HIT/CD-HIT-4.6.1-foss-2015b-2012-08-27.eb b/easybuild/easyconfigs/c/CD-HIT/CD-HIT-4.6.1-foss-2015b-2012-08-27.eb
index d4682f582da01771ed802577e5270de2419d52f9..2fdb2ffa3dd765a3b7e3049c29125cb8a213445e 100644
--- a/easybuild/easyconfigs/c/CD-HIT/CD-HIT-4.6.1-foss-2015b-2012-08-27.eb
+++ b/easybuild/easyconfigs/c/CD-HIT/CD-HIT-4.6.1-foss-2015b-2012-08-27.eb
@@ -26,7 +26,7 @@ buildopts = ' CC="$CXX" CCFLAGS="$CPPFLAGS $CXXFLAGS"'
 list_of_executables = ["cd-hit", "cd-hit-est", "cd-hit-2d", "cd-hit-est-2d", "cd-hit-div", "cd-hit-454"]
 
 # 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'), "README", "doc", "license.txt" ]
+files_to_copy = [(list_of_executables, "bin"), (["*.pl"], 'bin'), "README", "doc", "license.txt"]
 
 sanity_check_paths = {
     'files': ["bin/%s" % x for x in list_of_executables],
diff --git a/easybuild/easyconfigs/c/CD-HIT/CD-HIT-4.6.1-goolf-1.4.10-2012-08-27.eb b/easybuild/easyconfigs/c/CD-HIT/CD-HIT-4.6.1-goolf-1.4.10-2012-08-27.eb
index f2058ca8b6c1abbfb552e771f05d5b94508769ec..c3e01a8650558ef7e96a5aa408471491e93a6d08 100644
--- a/easybuild/easyconfigs/c/CD-HIT/CD-HIT-4.6.1-goolf-1.4.10-2012-08-27.eb
+++ b/easybuild/easyconfigs/c/CD-HIT/CD-HIT-4.6.1-goolf-1.4.10-2012-08-27.eb
@@ -26,7 +26,7 @@ buildopts = ' CC="$CXX" CCFLAGS="$CPPFLAGS $CXXFLAGS"'
 list_of_executables = ["cd-hit", "cd-hit-est", "cd-hit-2d", "cd-hit-est-2d", "cd-hit-div", "cd-hit-454"]
 
 # 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'), "README", "doc", "license.txt" ]
+files_to_copy = [(list_of_executables, "bin"), (["*.pl"], 'bin'), "README", "doc", "license.txt"]
 
 sanity_check_paths = {
     'files': ["bin/%s" % x for x in list_of_executables],
diff --git a/easybuild/easyconfigs/c/CD-HIT/CD-HIT-4.6.1-ictce-5.5.0-2012-08-27.eb b/easybuild/easyconfigs/c/CD-HIT/CD-HIT-4.6.1-ictce-5.5.0-2012-08-27.eb
index 83b5369b717740170ea409eb5aa81bf359a353a8..5563d4c561422f70dd3711659e9552d51d59f8ed 100644
--- a/easybuild/easyconfigs/c/CD-HIT/CD-HIT-4.6.1-ictce-5.5.0-2012-08-27.eb
+++ b/easybuild/easyconfigs/c/CD-HIT/CD-HIT-4.6.1-ictce-5.5.0-2012-08-27.eb
@@ -26,7 +26,7 @@ buildopts = ' CC="$CXX" CCFLAGS="$CPPFLAGS $CXXFLAGS"'
 list_of_executables = ["cd-hit", "cd-hit-est", "cd-hit-2d", "cd-hit-est-2d", "cd-hit-div", "cd-hit-454"]
 
 # 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'), "README", "doc", "license.txt" ]
+files_to_copy = [(list_of_executables, "bin"), (["*.pl"], 'bin'), "README", "doc", "license.txt"]
 
 sanity_check_paths = {
     'files': ["bin/%s" % x for x in list_of_executables],
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 b3d2485ff06869c70502ac4a1a4208cc4477fb5f..268e5321921fd0de713f902f02510d7f97fa57f1 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
@@ -35,7 +35,7 @@ files_to_copy = [
     "doc",
     "license.txt",
     "psi-cd-hit/README.psi-cd-hit",
- ]
+]
 
 sanity_check_paths = {
     'files': ["bin/%s" % x for x in list_of_executables],
diff --git a/easybuild/easyconfigs/c/CD-HIT/CD-HIT-4.6.4-foss-2015b-2015-0603.eb b/easybuild/easyconfigs/c/CD-HIT/CD-HIT-4.6.4-foss-2015b-2015-0603.eb
index e2e712b7d506ef79e665debea9abc8ea6deb139e..832db33507641bc6a63a00d3e30db8b7d9297c97 100644
--- a/easybuild/easyconfigs/c/CD-HIT/CD-HIT-4.6.4-foss-2015b-2015-0603.eb
+++ b/easybuild/easyconfigs/c/CD-HIT/CD-HIT-4.6.4-foss-2015b-2015-0603.eb
@@ -26,7 +26,7 @@ buildopts = ' CC="$CXX" CCFLAGS="$CPPFLAGS $CXXFLAGS"'
 list_of_executables = ["cd-hit", "cd-hit-est", "cd-hit-2d", "cd-hit-est-2d", "cd-hit-div", "cd-hit-454"]
 
 # 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'), "README", "doc", "license.txt" ]
+files_to_copy = [(list_of_executables, "bin"), (["*.pl"], 'bin'), "README", "doc", "license.txt"]
 
 sanity_check_paths = {
     'files': ["bin/%s" % x for x in list_of_executables],
diff --git a/easybuild/easyconfigs/c/CFITSIO/CFITSIO-3.34-goolf-1.4.10.eb b/easybuild/easyconfigs/c/CFITSIO/CFITSIO-3.34-goolf-1.4.10.eb
index 3373480b9bbe34c02a1eaf0e66ec6d568eb39f34..9a156bffea04a2263263911b14d5d9df343c7e7b 100644
--- a/easybuild/easyconfigs/c/CFITSIO/CFITSIO-3.34-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/c/CFITSIO/CFITSIO-3.34-goolf-1.4.10.eb
@@ -15,8 +15,8 @@ source_urls = ['ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/']
 sources = ['%%(namelower)s%s.tar.gz' % srcversion]
 
 sanity_check_paths = {
-    'files':["lib/libcfitsio.a"],
-    'dirs':["include"],
+    'files': ["lib/libcfitsio.a"],
+    'dirs': ["include"],
 }
 
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/c/CFITSIO/CFITSIO-3.34-ictce-4.1.13.eb b/easybuild/easyconfigs/c/CFITSIO/CFITSIO-3.34-ictce-4.1.13.eb
index 7086648457b854c03f246587035bb64bf28ab602..0fc72a1115e164ba3b238daf3564a7676f758c52 100644
--- a/easybuild/easyconfigs/c/CFITSIO/CFITSIO-3.34-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/c/CFITSIO/CFITSIO-3.34-ictce-4.1.13.eb
@@ -15,8 +15,8 @@ source_urls = ['ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/']
 sources = ['%%(namelower)s%s.tar.gz' % srcversion]
 
 sanity_check_paths = {
-    'files':["lib/libcfitsio.a"],
-    'dirs':["include"],
+    'files': ["lib/libcfitsio.a"],
+    'dirs': ["include"],
 }
 
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/c/CFITSIO/CFITSIO-3.34-ictce-5.3.0.eb b/easybuild/easyconfigs/c/CFITSIO/CFITSIO-3.34-ictce-5.3.0.eb
index bbd4471f375f21c0f5594a921cd9bda0f9a235ba..bf8fb571c8d7adb1e5e25fef20acd59d7cb94dde 100644
--- a/easybuild/easyconfigs/c/CFITSIO/CFITSIO-3.34-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/c/CFITSIO/CFITSIO-3.34-ictce-5.3.0.eb
@@ -15,8 +15,8 @@ source_urls = ['ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/']
 sources = ['%%(namelower)s%s.tar.gz' % srcversion]
 
 sanity_check_paths = {
-    'files':["lib/libcfitsio.a"],
-    'dirs':["include"],
+    'files': ["lib/libcfitsio.a"],
+    'dirs': ["include"],
 }
 
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/c/CGAL/CGAL-4.0-ictce-4.0.6-Python-2.7.3.eb b/easybuild/easyconfigs/c/CGAL/CGAL-4.0-ictce-4.0.6-Python-2.7.3.eb
index 83a1ddddd0226152ebf04ebe302964beb365a9f4..09a71c9763fa441360e7ac60f9c19397c447af91 100644
--- a/easybuild/easyconfigs/c/CGAL/CGAL-4.0-ictce-4.0.6-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/c/CGAL/CGAL-4.0-ictce-4.0.6-Python-2.7.3.eb
@@ -24,4 +24,3 @@ dependencies = [
 ]
 
 moduleclass = 'numlib'
-
diff --git a/easybuild/easyconfigs/c/CGAL/CGAL-4.0-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/c/CGAL/CGAL-4.0-ictce-5.3.0-Python-2.7.3.eb
index 1e713bc44abc194d868453fb0c3fef8e2c193def..c407409f323a2247b8094bcf2f2820c78b0958a0 100644
--- a/easybuild/easyconfigs/c/CGAL/CGAL-4.0-ictce-5.3.0-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/c/CGAL/CGAL-4.0-ictce-5.3.0-Python-2.7.3.eb
@@ -25,4 +25,3 @@ dependencies = [
 ]
 
 moduleclass = 'numlib'
-
diff --git a/easybuild/easyconfigs/c/CGAL/CGAL-4.6-intel-2015a-GLib-2.44.1-Python-2.7.10.eb b/easybuild/easyconfigs/c/CGAL/CGAL-4.6-intel-2015a-GLib-2.44.1-Python-2.7.10.eb
index 9dca8053a4b5bbe2032c9744f126d1abc731d80a..566b71d5c5992601fcc064114ab98ae6c457c800 100644
--- a/easybuild/easyconfigs/c/CGAL/CGAL-4.6-intel-2015a-GLib-2.44.1-Python-2.7.10.eb
+++ b/easybuild/easyconfigs/c/CGAL/CGAL-4.6-intel-2015a-GLib-2.44.1-Python-2.7.10.eb
@@ -17,7 +17,7 @@ pysuff = '-Python-2.7.10'
 versionsuffix = '%s%s' % ('-GLib-2.44.1', pysuff)
 
 dependencies = [
-    #GMP does not compile correctly with ICC on Haswell architecture using pre 2015b toolchain
+    # GMP does not compile correctly with ICC on Haswell architecture using pre 2015b toolchain
     ('GMP', '6.0.0a', '', ('GCC', '4.9.2')),
     ('Boost', '1.58.0', pysuff),
     ('MPFR', '3.1.2', '-GMP-6.0.0a'),
diff --git a/easybuild/easyconfigs/c/CGAL/CGAL-4.6-intel-2015a-Python-2.7.10.eb b/easybuild/easyconfigs/c/CGAL/CGAL-4.6-intel-2015a-Python-2.7.10.eb
index f6286f011cec11418faea3be568910adee6805d9..ff84775666e2f56d7e0854413923b760a0d90ce4 100644
--- a/easybuild/easyconfigs/c/CGAL/CGAL-4.6-intel-2015a-Python-2.7.10.eb
+++ b/easybuild/easyconfigs/c/CGAL/CGAL-4.6-intel-2015a-Python-2.7.10.eb
@@ -17,7 +17,7 @@ pythonversion = '2.7.10'
 versionsuffix = "-Python-%s" % pythonversion
 
 dependencies = [
-#GMP does not compile correctly with ICC on Haswell architecture
+    # GMP does not compile correctly with ICC on Haswell architecture
     ('GMP', '6.0.0a', '', ('GCC', '4.9.2')),
     ('Boost', '1.58.0', versionsuffix),
     ('MPFR', '3.1.2', '-GMP-6.0.0a'),
diff --git a/easybuild/easyconfigs/c/CGAL/CGAL-4.6-intel-2015a-Python-2.7.9.eb b/easybuild/easyconfigs/c/CGAL/CGAL-4.6-intel-2015a-Python-2.7.9.eb
index b27b5edd11213a6cfcc2869135dd33a6a2999563..59646f1f0f5f2a7c85e8d14785e9d01df569eee0 100644
--- a/easybuild/easyconfigs/c/CGAL/CGAL-4.6-intel-2015a-Python-2.7.9.eb
+++ b/easybuild/easyconfigs/c/CGAL/CGAL-4.6-intel-2015a-Python-2.7.9.eb
@@ -17,7 +17,7 @@ pythonversion = '2.7.9'
 versionsuffix = "-Python-%s" % pythonversion
 
 dependencies = [
-#GMP does not compile correctly with ICC on Haswell architecture
+    # GMP does not compile correctly with ICC on Haswell architecture
     ('GMP', '6.0.0a', '', ('GCC', '4.9.2')),
     ('Boost', '1.58.0', versionsuffix),
     ('MPFR', '3.1.2', '-GMP-6.0.0a'),
diff --git a/easybuild/easyconfigs/c/CGAL/CGAL-4.6.3-intel-2015b-Python-2.7.10.eb b/easybuild/easyconfigs/c/CGAL/CGAL-4.6.3-intel-2015b-Python-2.7.10.eb
index f4f6ee73bf4cded92e1d0c99ec84b17e3a7426d0..40ba6d07e7f49ac6ba5406ce69f0dc4f42945ee2 100644
--- a/easybuild/easyconfigs/c/CGAL/CGAL-4.6.3-intel-2015b-Python-2.7.10.eb
+++ b/easybuild/easyconfigs/c/CGAL/CGAL-4.6.3-intel-2015b-Python-2.7.10.eb
@@ -24,7 +24,7 @@ dependencies = [
 ]
 
 builddependencies = [
-#CGAL 4.6.3 does not build with CMake 3.3.2!
+    # CGAL 4.6.3 does not build with CMake 3.3.2!
     ('CMake', '3.2.3'),
 ]
 
diff --git a/easybuild/easyconfigs/c/CMake/CMake-3.4.1-GCC-4.9.2.eb b/easybuild/easyconfigs/c/CMake/CMake-3.4.1-GCC-4.9.2.eb
new file mode 100644
index 0000000000000000000000000000000000000000..cb117db3226d4a7d5c796c422ea7ec9d2d8cc35e
--- /dev/null
+++ b/easybuild/easyconfigs/c/CMake/CMake-3.4.1-GCC-4.9.2.eb
@@ -0,0 +1,22 @@
+easyblock = 'ConfigureMake'
+
+name = 'CMake'
+version = '3.4.1'
+
+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': 'GCC', 'version': '4.9.2'}
+
+source_urls = ['http://www.cmake.org/files/v%(version_major_minor)s']
+sources = [SOURCELOWER_TAR_GZ]
+
+dependencies = [('ncurses', '5.9')]
+
+sanity_check_paths = {
+    'files': ["bin/%s" % x for x in ['cmake', 'cpack', 'ctest']],
+    'dirs': [],
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/c/CMake/CMake-3.4.1-foss-2015a.eb b/easybuild/easyconfigs/c/CMake/CMake-3.4.1-foss-2015a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..4f9c1dcfa2ca5ca1cdfd6ba248f226d74380dd0c
--- /dev/null
+++ b/easybuild/easyconfigs/c/CMake/CMake-3.4.1-foss-2015a.eb
@@ -0,0 +1,28 @@
+easyblock = 'ConfigureMake'
+
+name = 'CMake'
+version = '3.4.1'
+
+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': 'foss', 'version': '2015a'}
+
+source_urls = ['http://www.cmake.org/files/v%(version_major_minor)s']
+sources = [SOURCELOWER_TAR_GZ]
+
+configopts = '-- -DCMAKE_USE_OPENSSL=1'
+
+dependencies = [
+    ('ncurses', '5.9'),
+]
+
+osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
+
+sanity_check_paths = {
+    'files': ["bin/%s" % x for x in ['cmake', 'cpack', 'ctest']],
+    'dirs': [],
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/c/CMake/CMake-3.4.3-foss-2016a.eb b/easybuild/easyconfigs/c/CMake/CMake-3.4.3-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..e6beb92beec75b68d631264600ddc139f381db97
--- /dev/null
+++ b/easybuild/easyconfigs/c/CMake/CMake-3.4.3-foss-2016a.eb
@@ -0,0 +1,31 @@
+easyblock = 'ConfigureMake'
+
+name = 'CMake'
+version = '3.4.3'
+
+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': 'foss', 'version': '2016a'}
+
+source_urls = ['http://www.cmake.org/files/v%(version_major_minor)s']
+sources = [SOURCELOWER_TAR_GZ]
+
+configopts = '-- -DCMAKE_USE_OPENSSL=1'
+
+dependencies = [
+    ('ncurses', '6.0'),
+    # OS dependency should be preferred if the os version is more recent then this version,
+    # it's nice to have an up to date openssl for security reasons
+    #('OpenSSL', '1.0.1p'),
+]
+
+osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
+
+sanity_check_paths = {
+    'files': ["bin/%s" % x for x in ['cmake', 'cpack', 'ctest']],
+    'dirs': [],
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/c/CMake/CMake-3.4.3-intel-2016a.eb b/easybuild/easyconfigs/c/CMake/CMake-3.4.3-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..31b70f1b8ad9103d977bedd2830901882b501e41
--- /dev/null
+++ b/easybuild/easyconfigs/c/CMake/CMake-3.4.3-intel-2016a.eb
@@ -0,0 +1,31 @@
+easyblock = 'ConfigureMake'
+
+name = 'CMake'
+version = '3.4.3'
+
+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': '2016a'}
+
+source_urls = ['http://www.cmake.org/files/v%(version_major_minor)s']
+sources = [SOURCELOWER_TAR_GZ]
+
+configopts = '-- -DCMAKE_USE_OPENSSL=1'
+
+dependencies = [
+    ('ncurses', '6.0'),
+    # OS dependency should be preferred if the os version is more recent then this version,
+    # it's nice to have an up to date openssl for security reasons
+    #('OpenSSL', '1.0.1p'),
+]
+
+osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
+
+sanity_check_paths = {
+    'files': ["bin/%s" % x for x in ['cmake', 'cpack', 'ctest']],
+    'dirs': [],
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/c/CONTRAfold/CONTRAfold-2.02-goolf-1.4.10.eb b/easybuild/easyconfigs/c/CONTRAfold/CONTRAfold-2.02-goolf-1.4.10.eb
index 34d8a45119aab110365d6e7ef761c6d3c48d0321..7f2755eaba59e0985222fc89c2b130653afc453e 100644
--- a/easybuild/easyconfigs/c/CONTRAfold/CONTRAfold-2.02-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/c/CONTRAfold/CONTRAfold-2.02-goolf-1.4.10.eb
@@ -14,7 +14,7 @@ description = ''' CONditional TRAining for RNA Secondary Structure Prediction  '
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 
 source_urls = [homepage]
-sources = ['%s_v%s.tar.gz' % (name.lower(),version.replace('.','_'))]
+sources = ['%%(namelower)s_v%s.tar.gz' % version.replace('.', '_')]
 
 patches = ['contrafold-gcc47.patch']
 
diff --git a/easybuild/easyconfigs/c/CP2K/CP2K-20111205-gmacml-1.7.0-libsmm.eb b/easybuild/easyconfigs/c/CP2K/CP2K-20111205-gmacml-1.7.0-libsmm.eb
index fb47d44650fe9041d57334fd087801816e3176aa..ae5eb6f8dc35487ff58447dbd0ad26fd086d95bb 100644
--- a/easybuild/easyconfigs/c/CP2K/CP2K-20111205-gmacml-1.7.0-libsmm.eb
+++ b/easybuild/easyconfigs/c/CP2K/CP2K-20111205-gmacml-1.7.0-libsmm.eb
@@ -13,25 +13,25 @@ toolchain = {'name': 'gmacml', 'version': '1.7.0'}
 sources = [SOURCE_TAR_GZ]
 
 patches = [
-           'fix_compile_date_lastcvs.patch',
-           'do_regtest_nocompile.patch',
-          ]
+    'fix_compile_date_lastcvs.patch',
+    'do_regtest_nocompile.patch',
+]
 
 builddependencies = [
-                     ('flex', '2.5.35'),
-                     ('Bison', '2.5'),
-                    ]
+    ('flex', '2.5.35'),
+    ('Bison', '2.5'),
+]
 
 dependencies = [
-                ('Libint', '1.1.4'),
-                ('libsmm', version),
-               ]
+    ('Libint', '1.1.4'),
+    ('libsmm', version),
+]
 
 # don't use parallel make, results in compilation failure
 # because Fortran module files aren't created before they are needed
 parallel = 1
 
 # regression test reports failures (1/2196 tests fail with segfault)
-ignore_regtest_fails=True
+ignore_regtest_fails = True
 
 moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/c/CP2K/CP2K-20111205-goalf-1.1.0-no-OFED-libsmm.eb b/easybuild/easyconfigs/c/CP2K/CP2K-20111205-goalf-1.1.0-no-OFED-libsmm.eb
index b2c0a55708e946e65c6ec40b0a26f14f7b82585b..3ecba232f18e73edbb24648c5c90528b4a9957ff 100644
--- a/easybuild/easyconfigs/c/CP2K/CP2K-20111205-goalf-1.1.0-no-OFED-libsmm.eb
+++ b/easybuild/easyconfigs/c/CP2K/CP2K-20111205-goalf-1.1.0-no-OFED-libsmm.eb
@@ -13,19 +13,19 @@ toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
 sources = [SOURCE_TAR_GZ]
 
 patches = [
-           'fix_compile_date_lastcvs.patch',
-           'do_regtest_nocompile.patch'
-          ]
+    'fix_compile_date_lastcvs.patch',
+    'do_regtest_nocompile.patch'
+]
 
 builddependencies = [
-                     ('flex', '2.5.35'),
-                     ('Bison', '2.5')
-                    ]
+    ('flex', '2.5.35'),
+    ('Bison', '2.5')
+]
 
 dependencies = [
-                ('Libint', '1.1.4'),
-                ('libsmm', '20111205')
-               ]
+    ('Libint', '1.1.4'),
+    ('libsmm', '20111205')
+]
 
 # don't use parallel make, results in compilation failure
 # because Fortran module files aren't created before they are needed
diff --git a/easybuild/easyconfigs/c/CP2K/CP2K-20111205-goalf-1.1.0-no-OFED-psmp.eb b/easybuild/easyconfigs/c/CP2K/CP2K-20111205-goalf-1.1.0-no-OFED-psmp.eb
index 09bbad25c0517b875cf597d22c575835a2a5d17f..ede4ebe0fc707cb84b87e0b6ec2ae24e90a01664 100644
--- a/easybuild/easyconfigs/c/CP2K/CP2K-20111205-goalf-1.1.0-no-OFED-psmp.eb
+++ b/easybuild/easyconfigs/c/CP2K/CP2K-20111205-goalf-1.1.0-no-OFED-psmp.eb
@@ -13,15 +13,15 @@ toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
 sources = [SOURCE_TAR_GZ]
 
 patches = [
-           'fix_compile_date_lastcvs.patch',
-           'do_regtest_nocompile.patch',
-           'fix_psmp_build.patch'
-          ]
+    'fix_compile_date_lastcvs.patch',
+    'do_regtest_nocompile.patch',
+    'fix_psmp_build.patch'
+]
 
 builddependencies = [
-                     ('flex', '2.5.35'),
-                     ('Bison', '2.5')
-                    ]
+    ('flex', '2.5.35'),
+    ('Bison', '2.5')
+]
 
 dependencies = [('Libint', '1.1.4')]
 
diff --git a/easybuild/easyconfigs/c/CP2K/CP2K-20111205-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/c/CP2K/CP2K-20111205-goalf-1.1.0-no-OFED.eb
index 06ae6f94443db328dc319f3b2f7e6d297c8e4d20..e3679af61b627f6251e16d113819e8f1dc49442b 100644
--- a/easybuild/easyconfigs/c/CP2K/CP2K-20111205-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/c/CP2K/CP2K-20111205-goalf-1.1.0-no-OFED.eb
@@ -12,14 +12,14 @@ toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
 sources = [SOURCE_TAR_GZ]
 
 patches = [
-           'fix_compile_date_lastcvs.patch',
-           'do_regtest_nocompile.patch'
-          ]
+    'fix_compile_date_lastcvs.patch',
+    'do_regtest_nocompile.patch'
+]
 
 builddependencies = [
-                     ('flex', '2.5.35'),
-                     ('Bison', '2.5')
-                    ]
+    ('flex', '2.5.35'),
+    ('Bison', '2.5')
+]
 
 dependencies = [('Libint', '1.1.4')]
 
diff --git a/easybuild/easyconfigs/c/CP2K/CP2K-20111205-goolf-1.4.10-libsmm.eb b/easybuild/easyconfigs/c/CP2K/CP2K-20111205-goolf-1.4.10-libsmm.eb
index 7366879bfdc001c9863d4304485acb788665519a..70f7866473f3faa2e30fa97a056e449913172e88 100644
--- a/easybuild/easyconfigs/c/CP2K/CP2K-20111205-goolf-1.4.10-libsmm.eb
+++ b/easybuild/easyconfigs/c/CP2K/CP2K-20111205-goolf-1.4.10-libsmm.eb
@@ -13,25 +13,25 @@ toolchain = {'name': 'goolf', 'version': '1.4.10'}
 sources = [SOURCE_TAR_GZ]
 
 patches = [
-           'fix_compile_date_lastcvs.patch',
-           'do_regtest_nocompile.patch'
-          ]
+    'fix_compile_date_lastcvs.patch',
+    'do_regtest_nocompile.patch'
+]
 
 builddependencies = [
-                     ('flex', '2.5.35'),
-                     ('Bison', '2.5')
-                    ]
+    ('flex', '2.5.35'),
+    ('Bison', '2.5')
+]
 
 dependencies = [
-                ('Libint', '1.1.4'),
-                ('libsmm', '20111205')
-               ]
+    ('Libint', '1.1.4'),
+    ('libsmm', '20111205')
+]
 
 # don't use parallel make, results in compilation failure
 # because Fortran module files aren't created before they are needed
 parallel = 1
 
 # about 100 tests fail
-ignore_regtest_fails=True
+ignore_regtest_fails = True
 
 moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/c/CP2K/CP2K-20111205-goolf-1.4.10-psmp.eb b/easybuild/easyconfigs/c/CP2K/CP2K-20111205-goolf-1.4.10-psmp.eb
index a2f304ace23960b9406e9e98a8a5c9349be9800c..df760b1c153662d76a06eda178f3cc9f008e9a2c 100644
--- a/easybuild/easyconfigs/c/CP2K/CP2K-20111205-goolf-1.4.10-psmp.eb
+++ b/easybuild/easyconfigs/c/CP2K/CP2K-20111205-goolf-1.4.10-psmp.eb
@@ -13,15 +13,15 @@ toolchain = {'name': 'goolf', 'version': '1.4.10'}
 sources = [SOURCE_TAR_GZ]
 
 patches = [
-           'fix_compile_date_lastcvs.patch',
-           'do_regtest_nocompile.patch',
-           'fix_psmp_build.patch'
-          ]
+    'fix_compile_date_lastcvs.patch',
+    'do_regtest_nocompile.patch',
+    'fix_psmp_build.patch'
+]
 
 builddependencies = [
-                     ('flex', '2.5.35'),
-                     ('Bison', '2.5')
-                    ]
+    ('flex', '2.5.35'),
+    ('Bison', '2.5')
+]
 
 dependencies = [('Libint', '1.1.4')]
 
diff --git a/easybuild/easyconfigs/c/CP2K/CP2K-20111205-goolf-1.4.10.eb b/easybuild/easyconfigs/c/CP2K/CP2K-20111205-goolf-1.4.10.eb
index 3d113cc1d8c7607522917d3a3b677950cb53e977..10f8d7440a7a86e1c7ee3fc10a0a1c88a08c695f 100644
--- a/easybuild/easyconfigs/c/CP2K/CP2K-20111205-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/c/CP2K/CP2K-20111205-goolf-1.4.10.eb
@@ -12,14 +12,14 @@ toolchain = {'name': 'goolf', 'version': '1.4.10'}
 sources = [SOURCE_TAR_GZ]
 
 patches = [
-           'fix_compile_date_lastcvs.patch',
-           'do_regtest_nocompile.patch'
-          ]
+    'fix_compile_date_lastcvs.patch',
+    'do_regtest_nocompile.patch'
+]
 
 builddependencies = [
-                     ('flex', '2.5.35'),
-                     ('Bison', '2.5')
-                    ]
+    ('flex', '2.5.35'),
+    ('Bison', '2.5')
+]
 
 dependencies = [('Libint', '1.1.4')]
 
@@ -28,6 +28,6 @@ dependencies = [('Libint', '1.1.4')]
 parallel = 1
 
 # about 100 tests fail
-ignore_regtest_fails=True
+ignore_regtest_fails = True
 
 moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/c/CP2K/CP2K-20111205-ictce-3.2.2.u3.eb b/easybuild/easyconfigs/c/CP2K/CP2K-20111205-ictce-3.2.2.u3.eb
index 1862b31e51a47aca0f44ce36da909c2f76a3f618..6e21a831bc8a75e1907fd3a0084cda58468009d0 100644
--- a/easybuild/easyconfigs/c/CP2K/CP2K-20111205-ictce-3.2.2.u3.eb
+++ b/easybuild/easyconfigs/c/CP2K/CP2K-20111205-ictce-3.2.2.u3.eb
@@ -12,14 +12,14 @@ toolchain = {'name': 'ictce', 'version': '3.2.2.u3'}
 sources = [SOURCE_TAR_GZ]
 
 patches = [
-           'fix_compile_date_lastcvs.patch',
-           'do_regtest_nocompile.patch'
-          ]
+    'fix_compile_date_lastcvs.patch',
+    'do_regtest_nocompile.patch'
+]
 
 builddependencies = [
-                     ('flex', '2.5.35'),
-                     ('Bison', '2.5')
-                    ]
+    ('flex', '2.5.35'),
+    ('Bison', '2.5')
+]
 
 dependencies = [('Libint', '1.1.4')]
 
diff --git a/easybuild/easyconfigs/c/CUDA/CUDA-5.0.35-1.eb b/easybuild/easyconfigs/c/CUDA/CUDA-5.0.35-1.eb
index 4c8b4e861d4a8a0ca926d9c336d0620d32adc49b..299410b70c78ed6b7fc80e299e0883408606fd9a 100644
--- a/easybuild/easyconfigs/c/CUDA/CUDA-5.0.35-1.eb
+++ b/easybuild/easyconfigs/c/CUDA/CUDA-5.0.35-1.eb
@@ -31,7 +31,7 @@ if OS_NAME in ['fedora', 'redhat']:
 elif OS_NAME in ["RHEL", "SL", "centos"]:
     system = 'rhel%s.x' % OS_VERSION.split('.')[0]
 elif OS_NAME in ['debian'] and OS_VERSION.startswith('6.'):
-        system = 'ubuntu10.04'
+    system = 'ubuntu10.04'
 elif OS_NAME in ['debian', 'ubuntu']:
     if OS_VERSION in ['11.10', '10.04']:
         system = 'ubuntu%s' % OS_VERSION
diff --git a/easybuild/easyconfigs/c/CUDA/CUDA-5.0.35-GCC-4.6.4-1.eb b/easybuild/easyconfigs/c/CUDA/CUDA-5.0.35-GCC-4.6.4-1.eb
index b7d19819664058b4592950b8e5c4e8dd61b0e977..9b2a072f8b8b668acd1594415a83634eec62a8f2 100644
--- a/easybuild/easyconfigs/c/CUDA/CUDA-5.0.35-GCC-4.6.4-1.eb
+++ b/easybuild/easyconfigs/c/CUDA/CUDA-5.0.35-GCC-4.6.4-1.eb
@@ -31,7 +31,7 @@ if OS_NAME in ['fedora', 'redhat']:
 elif OS_NAME in ["RHEL", "SL", "centos"]:
     system = 'rhel%s.x' % OS_VERSION.split('.')[0]
 elif OS_NAME in ['debian'] and OS_VERSION.startswith('6.'):
-        system = 'ubuntu10.04'
+    system = 'ubuntu10.04'
 elif OS_NAME in ['debian', 'ubuntu']:
     if OS_VERSION in ['11.10', '10.04']:
         system = 'ubuntu%s' % OS_VERSION
diff --git a/easybuild/easyconfigs/c/CUDA/CUDA-7.5.18-iccifort-2015.3.187-GNU-4.9.3-2.25.eb b/easybuild/easyconfigs/c/CUDA/CUDA-7.5.18-iccifort-2015.3.187-GNU-4.9.3-2.25.eb
new file mode 100644
index 0000000000000000000000000000000000000000..f2ca68b5c14c5f44312491f6fbbc352095c74be0
--- /dev/null
+++ b/easybuild/easyconfigs/c/CUDA/CUDA-7.5.18-iccifort-2015.3.187-GNU-4.9.3-2.25.eb
@@ -0,0 +1,43 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2012-2013 Cyprus Institute / CaSToRC, University of Luxembourg / LCSB, Ghent University,
+# Forschungszentrum Juelich
+# Authors::   George Tsouloupas <g.tsouloupas@cyi.ac.cy>, Fotis Georgatos <fotis.georgatos@uni.lu>, Kenneth Hoste
+# Authors::   Damian Alvarez <d.alvarez@fz-juelich.de>
+# License::   MIT/GPL
+# $Id$
+#
+# This work implements a part of the HPCBIOS project and is a component of the policy:
+# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-99.html
+##
+
+#easyblock = 'ConfigureMake'
+
+name = 'CUDA'
+version = '7.5.18'
+
+homepage = 'https://developer.nvidia.com/cuda-toolkit'
+description = """CUDA (formerly Compute Unified Device Architecture) is a parallel
+ computing platform and programming model created by NVIDIA and implemented by the
+ graphics processing units (GPUs) that they produce. CUDA gives developers access
+ to the virtual instruction set and memory of the parallel computational elements in CUDA GPUs."""
+
+toolchain = {'name': 'iccifort', 'version': '2015.3.187-GNU-4.9.3-2.25'}
+
+source_urls = ['http://developer.download.nvidia.com/compute/cuda/%(version_major_minor)s/Prod/local_installers/']
+
+sources = ['%(namelower)s_%(version)s_linux.run']
+checksums = ['4b3bcecf0dfc35928a0898793cf3e4c6']
+
+# Necessary to allow to use a GCC 4.9.3 toolchain, as CUDA by default just supports up to 4.9.2.
+# Tested, but not throughly, so it is not guaranteed to don't cause problems
+installopts = '-override compiler'
+
+host_compilers = ["icpc", "g++"]
+
+# Be careful and have a message consistent with the generated wrappers
+modloadmsg = "nvcc uses g++ as the default host compiler. If you want to use icpc as a host compiler you can use"
+modloadmsg += " nvcc_icpc, or nvcc -ccbin=icpc. Likewise, a g++ wrapper called nvcc_g++ has been also created."
+
+moduleclass = 'system'
diff --git a/easybuild/easyconfigs/c/CVS/CVS-1.11.23-GCC-4.8.2.eb b/easybuild/easyconfigs/c/CVS/CVS-1.11.23-GCC-4.8.2.eb
index 19a3bd716f9177a5ae22ef51b907e2359d25ab46..b8b9c80a8dfe52f5ceff3631716f8f42f49ed28c 100644
--- a/easybuild/easyconfigs/c/CVS/CVS-1.11.23-GCC-4.8.2.eb
+++ b/easybuild/easyconfigs/c/CVS/CVS-1.11.23-GCC-4.8.2.eb
@@ -19,7 +19,7 @@ sources = [SOURCELOWER_TAR_BZ2]
 
 patches = ['CVS-1.11.23-zlib-1.patch', 'CVS-1.11.23-getline.patch']
 
-dependencies = [('zlib','1.2.8')]
+dependencies = [('zlib', '1.2.8')]
 
 sanity_check_paths = {
     'files': ['bin/cvs', 'bin/cvsbug', 'bin/rcs2log'],
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 4e4589531cde0f6bc5c484b836fe4ca27b62b684..eb2d005b6fe33719b6abc670e00d1c3d450e8cf4 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
@@ -32,13 +32,13 @@ installopts += 'cp -a README doc/ %(installdir)s'
 
 sanity_check_paths = {
     'files': ["bin/%s" % x for x in ["chipcenter", "chipcor", "chipextract", "chippart", "chippeak",
-                                    "chipscore", "compactsga", "counts_filter", "countsga", "featreplace"]],
+                                     "chipscore", "compactsga", "counts_filter", "countsga", "featreplace"]],
     'dirs': []
 }
 
 # add tools dir to PATH
 modextrapaths = {
-        'PATH': "tools",
+    'PATH': "tools",
 }
 
 # fix shebang line in all provided perl scripts in tools folder
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 cf00dd3653ec535f8a3fd1f67fcfd18bd14e5747..dcbe783b38e9c51a8140d81bdb4c9bc7ef482533 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
@@ -32,13 +32,13 @@ installopts += 'cp -a README doc/ %(installdir)s'
 
 sanity_check_paths = {
     'files': ["bin/%s" % x for x in ["chipcenter", "chipcor", "chipextract", "chippart", "chippeak",
-                                    "chipscore", "compactsga", "counts_filter", "countsga", "featreplace"]],
+                                     "chipscore", "compactsga", "counts_filter", "countsga", "featreplace"]],
     'dirs': []
 }
 
 # add tools dir to PATH
 modextrapaths = {
-        'PATH': "tools",
+    'PATH': "tools",
 }
 
 # fix shebang line in all provided perl scripts in tools folder
diff --git a/easybuild/easyconfigs/c/CheMPS2/CheMPS2-1.6-intel-2016a.eb b/easybuild/easyconfigs/c/CheMPS2/CheMPS2-1.6-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..aab739ed1901a03e0aa2af38f5e0159a956672e6
--- /dev/null
+++ b/easybuild/easyconfigs/c/CheMPS2/CheMPS2-1.6-intel-2016a.eb
@@ -0,0 +1,33 @@
+easyblock = 'CMakeMake'
+
+name = 'CheMPS2'
+version = '1.6'
+
+homepage = 'https://github.com/SebWouters/CheMPS2'
+description = """CheMPS2 is a scientific library which contains a spin-adapted implementation of the
+density matrix renormalization group (DMRG) for ab initio quantum chemistry."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+sources = ['v%(version)s.tar.gz']
+source_urls = ['https://github.com/SebWouters/CheMPS2/archive/']
+
+builddependencies = [('CMake', '3.4.1')]
+
+dependencies = [
+    ('GSL', '2.1'),
+    ('HDF5', '1.8.16')
+]
+
+buildopts = 'VERBOSE=1'
+
+runtest = 'test'
+
+separate_build_dir = True
+
+sanity_check_paths = {
+    'files': ['bin/chemps2', 'lib64/libchemps2.%s' % SHLIB_EXT, 'lib64/libchemps2.a'],
+    'dirs': ['include/chemps2']
+}
+
+moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/c/ClustalW2/ClustalW2-2.1-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/c/ClustalW2/ClustalW2-2.1-goalf-1.1.0-no-OFED.eb
index 141abe9b6a5f8592a83f2c77d0ac50e169724ecb..0649ad44a0cf79a918cdd74a09fa833478165b28 100644
--- a/easybuild/easyconfigs/c/ClustalW2/ClustalW2-2.1-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/c/ClustalW2/ClustalW2-2.1-goalf-1.1.0-no-OFED.eb
@@ -25,8 +25,8 @@ sources = ['%s-%s.tar.gz' % (name[:-1].lower(), version)]
 source_urls = ['ftp://ftp.ebi.ac.uk/pub/software/%s/%s' % (name.lower(), version)]
 
 sanity_check_paths = {
-                      'files': ['bin/clustalw2'],
-                      'dirs': []
-                     }
+    'files': ['bin/clustalw2'],
+    'dirs': []
+}
 
 moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/c/ClustalW2/ClustalW2-2.1-goolf-1.4.10.eb b/easybuild/easyconfigs/c/ClustalW2/ClustalW2-2.1-goolf-1.4.10.eb
index 0c4dba86a682493e50a48e6290da78335763201a..de52a79a13ccbd698ec83a6f90c6c85c7829f6c8 100644
--- a/easybuild/easyconfigs/c/ClustalW2/ClustalW2-2.1-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/c/ClustalW2/ClustalW2-2.1-goolf-1.4.10.eb
@@ -25,8 +25,8 @@ sources = ['%s-%s.tar.gz' % (name[:-1].lower(), version)]
 source_urls = ['ftp://ftp.ebi.ac.uk/pub/software/%s/%s' % (name.lower(), version)]
 
 sanity_check_paths = {
-                      'files': ['bin/clustalw2'],
-                      'dirs': []
-                     }
+    'files': ['bin/clustalw2'],
+    'dirs': []
+}
 
 moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/c/ClustalW2/ClustalW2-2.1-ictce-4.0.6.eb b/easybuild/easyconfigs/c/ClustalW2/ClustalW2-2.1-ictce-4.0.6.eb
index 93dc9500bdd473acd219edb8d495cc22b240cecf..cad6e2ddab6934b271d90ea7ae8a9bc7fa073c86 100644
--- a/easybuild/easyconfigs/c/ClustalW2/ClustalW2-2.1-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/c/ClustalW2/ClustalW2-2.1-ictce-4.0.6.eb
@@ -25,8 +25,8 @@ sources = ['%s-%s.tar.gz' % (name[:-1].lower(), version)]
 source_urls = ['ftp://ftp.ebi.ac.uk/pub/software/%s/%s' % (name.lower(), version)]
 
 sanity_check_paths = {
-                      'files': ['bin/clustalw2'],
-                      'dirs': []
-                     }
+    'files': ['bin/clustalw2'],
+    'dirs': []
+}
 
 moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/c/ClustalW2/ClustalW2-2.1-ictce-5.3.0.eb b/easybuild/easyconfigs/c/ClustalW2/ClustalW2-2.1-ictce-5.3.0.eb
index 381ad621a9993d0e1430a6c0384997895a08b457..068dfd89ced990008cd1385315607cdc4f8d4d1f 100644
--- a/easybuild/easyconfigs/c/ClustalW2/ClustalW2-2.1-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/c/ClustalW2/ClustalW2-2.1-ictce-5.3.0.eb
@@ -26,8 +26,8 @@ sources = ['%s-%s.tar.gz' % (name[:-1].lower(), version)]
 source_urls = ['ftp://ftp.ebi.ac.uk/pub/software/%s/%s' % (name.lower(), version)]
 
 sanity_check_paths = {
-                      'files': ['bin/clustalw2'],
-                      'dirs': []
-                     }
+    'files': ['bin/clustalw2'],
+    'dirs': []
+}
 
 moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/c/Coot/Coot-0.8.1-binary-Linux-x86_64-rhel-6-python-gtk2.eb b/easybuild/easyconfigs/c/Coot/Coot-0.8.1-binary-Linux-x86_64-rhel-6-python-gtk2.eb
index 54e36207e0e7d098db57aca44aa7681d8ec1d3eb..1386d5329d13ceaafbf596142c20501f5b8a0be9 100644
--- a/easybuild/easyconfigs/c/Coot/Coot-0.8.1-binary-Linux-x86_64-rhel-6-python-gtk2.eb
+++ b/easybuild/easyconfigs/c/Coot/Coot-0.8.1-binary-Linux-x86_64-rhel-6-python-gtk2.eb
@@ -19,9 +19,8 @@ source_urls = ['http://www2.mrc-lmb.cam.ac.uk/Personal/pemsley/coot/binaries/rel
 sources = ['%(namelower)s-%(version)s%(versionsuffix)s.tar.gz']
 
 sanity_check_paths = {
-    'files': ["bin/coot" ],
+    'files': ["bin/coot"],
     'dirs': ["bin"]
 }
 
 moduleclass = 'bio'
-
diff --git a/easybuild/easyconfigs/c/Corkscrew/Corkscrew-2.0-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/c/Corkscrew/Corkscrew-2.0-goalf-1.1.0-no-OFED.eb
index 6a4d78599df6cbe7e7c78ed3c5a8a6a0044387fc..a41c761aaf8787cfb11113db3d37ed0aa21daf24 100644
--- a/easybuild/easyconfigs/c/Corkscrew/Corkscrew-2.0-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/c/Corkscrew/Corkscrew-2.0-goalf-1.1.0-no-OFED.eb
@@ -21,8 +21,8 @@ source_urls = ['http://www.agroman.net/corkscrew/']
 toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
 
 sanity_check_paths = {
-                      'files': ['bin/corkscrew'],
-                      'dirs': []
-                     }
+    'files': ['bin/corkscrew'],
+    'dirs': []
+}
 
 moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/c/Corkscrew/Corkscrew-2.0-goolf-1.4.10.eb b/easybuild/easyconfigs/c/Corkscrew/Corkscrew-2.0-goolf-1.4.10.eb
index 7810f1ee53b8681b5930bf3b011fadee9f1b3494..8e4f18d89d9e8dd3789eed378a881b206c9e26e3 100644
--- a/easybuild/easyconfigs/c/Corkscrew/Corkscrew-2.0-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/c/Corkscrew/Corkscrew-2.0-goolf-1.4.10.eb
@@ -21,8 +21,8 @@ source_urls = ['http://www.agroman.net/corkscrew/']
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 
 sanity_check_paths = {
-                      'files': ['bin/corkscrew'],
-                      'dirs': []
-                     }
+    'files': ['bin/corkscrew'],
+    'dirs': []
+}
 
 moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/c/Corkscrew/Corkscrew-2.0-ictce-4.0.6.eb b/easybuild/easyconfigs/c/Corkscrew/Corkscrew-2.0-ictce-4.0.6.eb
index 3d22de6dc88436a9416b7520561eab60701f5af1..ebeb826b66cf8c176842c1649b6045a624edd871 100644
--- a/easybuild/easyconfigs/c/Corkscrew/Corkscrew-2.0-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/c/Corkscrew/Corkscrew-2.0-ictce-4.0.6.eb
@@ -21,8 +21,8 @@ source_urls = ['http://www.agroman.net/corkscrew/']
 toolchain = {'version': '4.0.6', 'name': 'ictce'}
 
 sanity_check_paths = {
-                      'files': ['bin/corkscrew'],
-                      'dirs': []
-                     }
+    'files': ['bin/corkscrew'],
+    'dirs': []
+}
 
 moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/c/Corkscrew/Corkscrew-2.0-ictce-5.3.0.eb b/easybuild/easyconfigs/c/Corkscrew/Corkscrew-2.0-ictce-5.3.0.eb
index 5f4aa901ed7f2eb5f76c0f3f09aa51706e0571f4..0afa91c77f6cd4a8591732f73a97fcdebb733879 100644
--- a/easybuild/easyconfigs/c/Corkscrew/Corkscrew-2.0-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/c/Corkscrew/Corkscrew-2.0-ictce-5.3.0.eb
@@ -22,8 +22,8 @@ source_urls = ['http://www.agroman.net/corkscrew/']
 toolchain = {'name': 'ictce', 'version': '5.3.0'}
 
 sanity_check_paths = {
-                      'files': ['bin/corkscrew'],
-                      'dirs': []
-                     }
+    'files': ['bin/corkscrew'],
+    'dirs': []
+}
 
 moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/c/Cube/Cube-4.2-gompi-1.4.12-no-OFED.eb b/easybuild/easyconfigs/c/Cube/Cube-4.2-gompi-1.4.12-no-OFED.eb
index 5cb3746c74c2691ad084117be085bee3f3ecc1fd..df627c9d7bd888190ba61276aa0d7232d2b44119 100644
--- a/easybuild/easyconfigs/c/Cube/Cube-4.2-gompi-1.4.12-no-OFED.eb
+++ b/easybuild/easyconfigs/c/Cube/Cube-4.2-gompi-1.4.12-no-OFED.eb
@@ -48,7 +48,8 @@ dependencies = [('Qt', '4.8.4')]
 configopts = "--without-java-reader"
 
 sanity_check_paths = {
-    'files': ["bin/cube", ("lib/libcube4.a", "lib64/libcube4.a"), ("lib/libcube4.%s" % SHLIB_EXT, "lib64/libcube4.%s" % SHLIB_EXT)],
+    'files': ["bin/cube", ("lib/libcube4.a", "lib64/libcube4.a"),
+              ("lib/libcube4.%s" % SHLIB_EXT, "lib64/libcube4.%s" % SHLIB_EXT)],
     'dirs': ["include/cube", "include/cubew"],
 }
 
diff --git a/easybuild/easyconfigs/c/Cube/Cube-4.2.3-goolf-1.5.14.eb b/easybuild/easyconfigs/c/Cube/Cube-4.2.3-goolf-1.5.14.eb
index 67d71a581b0d00695c98e5d3d6db911245c05b4b..ad5e3d68d5de180e287c7481048196235d95a1f3 100644
--- a/easybuild/easyconfigs/c/Cube/Cube-4.2.3-goolf-1.5.14.eb
+++ b/easybuild/easyconfigs/c/Cube/Cube-4.2.3-goolf-1.5.14.eb
@@ -34,7 +34,8 @@ dependencies = [('Qt', '4.8.4')]
 configopts = "--without-java-reader"
 
 sanity_check_paths = {
-    'files': ["bin/cube", ("lib/libcube4.a", "lib64/libcube4.a"), ("lib/libcube4.%s" % SHLIB_EXT, "lib64/libcube4.%s" % SHLIB_EXT)],
+    'files': ["bin/cube", ("lib/libcube4.a", "lib64/libcube4.a"),
+              ("lib/libcube4.%s" % SHLIB_EXT, "lib64/libcube4.%s" % SHLIB_EXT)],
     'dirs': ["include/cube", "include/cubew"],
 }
 
diff --git a/easybuild/easyconfigs/c/Cube/Cube-4.3-foss-2015a.eb b/easybuild/easyconfigs/c/Cube/Cube-4.3-foss-2015a.eb
index fb1b773cd43fcb5db7b3d5de88095f62a2d13ec5..5763a26ed17ff70921ed057ceb280f2779684ce5 100644
--- a/easybuild/easyconfigs/c/Cube/Cube-4.3-foss-2015a.eb
+++ b/easybuild/easyconfigs/c/Cube/Cube-4.3-foss-2015a.eb
@@ -40,7 +40,8 @@ dependencies = [('Qt', '4.8.6')]
 configopts = "--without-java-reader"
 
 sanity_check_paths = {
-    'files': ["bin/cube", ("lib/libcube4.a", "lib64/libcube4.a"), ("lib/libcube4.%s" % SHLIB_EXT, "lib64/libcube4.%s" % SHLIB_EXT)],
+    'files': ["bin/cube", ("lib/libcube4.a", "lib64/libcube4.a"),
+              ("lib/libcube4.%s" % SHLIB_EXT, "lib64/libcube4.%s" % SHLIB_EXT)],
     'dirs': ["include/cube", "include/cubew"],
 }
 
diff --git a/easybuild/easyconfigs/c/Cube/Cube-4.3-gompi-1.4.12-no-OFED.eb b/easybuild/easyconfigs/c/Cube/Cube-4.3-gompi-1.4.12-no-OFED.eb
index 27232c720ca1451114a449ce6043e22099e8c966..ced2f5b555ece120f4a91023aeb89d47b233e7b5 100644
--- a/easybuild/easyconfigs/c/Cube/Cube-4.3-gompi-1.4.12-no-OFED.eb
+++ b/easybuild/easyconfigs/c/Cube/Cube-4.3-gompi-1.4.12-no-OFED.eb
@@ -40,7 +40,8 @@ dependencies = [('Qt', '4.8.4')]
 configopts = "--without-java-reader"
 
 sanity_check_paths = {
-    'files': ["bin/cube", ("lib/libcube4.a", "lib64/libcube4.a"), ("lib/libcube4.%s" % SHLIB_EXT, "lib64/libcube4.%s" % SHLIB_EXT)],
+    'files': ["bin/cube", ("lib/libcube4.a", "lib64/libcube4.a"),
+              ("lib/libcube4.%s" % SHLIB_EXT, "lib64/libcube4.%s" % SHLIB_EXT)],
     'dirs': ["include/cube", "include/cubew"],
 }
 
diff --git a/easybuild/easyconfigs/c/Cube/Cube-4.3.2-foss-2015a.eb b/easybuild/easyconfigs/c/Cube/Cube-4.3.2-foss-2015a.eb
index c04c268ec15470fcc519f1e76a2986ee6286e88b..c274b99b8c0149424a64fe7b4b6b293fb191ad3e 100644
--- a/easybuild/easyconfigs/c/Cube/Cube-4.3.2-foss-2015a.eb
+++ b/easybuild/easyconfigs/c/Cube/Cube-4.3.2-foss-2015a.eb
@@ -34,7 +34,8 @@ checksums = [
 dependencies = [('Qt', '4.8.6')]
 
 sanity_check_paths = {
-    'files': ["bin/cube", ("lib/libcube4.a", "lib64/libcube4.a"), ("lib/libcube4.%s" % SHLIB_EXT, "lib64/libcube4.%s" % SHLIB_EXT)],
+    'files': ["bin/cube", ("lib/libcube4.a", "lib64/libcube4.a"),
+              ("lib/libcube4.%s" % SHLIB_EXT, "lib64/libcube4.%s" % SHLIB_EXT)],
     'dirs': ["include/cube", "include/cubew"],
 }
 
diff --git a/easybuild/easyconfigs/c/Cuby/Cuby-4-intel-2014b.eb b/easybuild/easyconfigs/c/Cuby/Cuby-4-intel-2014b.eb
index fee6df968e2f5d81b1c7c818d8e1531d47af4ddd..f49b28d34f0378a131aefe67b118e7e7fcd0bf87 100644
--- a/easybuild/easyconfigs/c/Cuby/Cuby-4-intel-2014b.eb
+++ b/easybuild/easyconfigs/c/Cuby/Cuby-4-intel-2014b.eb
@@ -14,13 +14,13 @@ description = """Cuby is a computational chemistry framework written in ruby.
 
 toolchain = {'name': 'intel', 'version': '2014b'}
 
-#Source can be obtained via http://cuby.molecular.cz/?page=Downloads
+# Source can be obtained via http://cuby.molecular.cz/?page=Downloads
 sources = ['cuby4.tgz']
 
 dependencies = [('Ruby', '2.1.5')]
 
 sanity_check_paths = {
-    'files': ['cuby4%s' % x for x in ['', '.rb' ]],
+    'files': ['cuby4%s' % x for x in ['', '.rb']],
     'dirs': ['classes'],
 }
 
diff --git a/easybuild/easyconfigs/c/Cython/Cython-0.22-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/c/Cython/Cython-0.22-goolf-1.4.10-Python-2.7.3.eb
index 5b829d6a73d164579c66f55718c674d93f99d091..1a87b1c99cc3d154d19ba8e26dae0b4b83704562 100644
--- a/easybuild/easyconfigs/c/Cython/Cython-0.22-goolf-1.4.10-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/c/Cython/Cython-0.22-goolf-1.4.10-Python-2.7.3.eb
@@ -21,8 +21,8 @@ cythonlibdir = 'lib/python' + pyshortver + '/site-packages/Cython-%(version)s-py
 dependencies = [(python, pythonver)]
 
 sanity_check_paths = {
-      'files': ['bin/cygdb', 'bin/cython', '%s/%%(namelower)s.py' % cythonlibdir],
-      'dirs': ['%s/%%(name)s' % cythonlibdir],
+    'files': ['bin/cygdb', 'bin/cython', '%s/%%(namelower)s.py' % cythonlibdir],
+    'dirs': ['%s/%%(name)s' % cythonlibdir],
 }
 
 moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/c/Cython/Cython-0.23.4-gimkl-2.11.5-Python-2.7.10.eb b/easybuild/easyconfigs/c/Cython/Cython-0.23.4-gimkl-2.11.5-Python-2.7.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..426fedf887289d59bfe82e89e8f88134eb524dcd
--- /dev/null
+++ b/easybuild/easyconfigs/c/Cython/Cython-0.23.4-gimkl-2.11.5-Python-2.7.10.eb
@@ -0,0 +1,24 @@
+easyblock = 'PythonPackage'
+
+name = 'Cython'
+version = '0.23.4'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'https://pypi.python.org/pypi/Cython/'
+description = """The Cython language makes writing C extensions for the Python language as easy as Python itself.
+Cython is a source code translator based on the well-known Pyrex, but supports more cutting edge functionality and optimizations."""
+
+toolchain = {'name': 'gimkl', 'version': '2.11.5'}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [('Python', '2.7.10')]
+
+cythonlibdir = 'lib/python%(pyshortver)s/site-packages/Cython-%(version)s-py%(pyshortver)s-linux-x86_64.egg'
+sanity_check_paths = {
+    'files': ['bin/cygdb', 'bin/cython', '%s/%%(namelower)s.py' % cythonlibdir],
+    'dirs': [cythonlibdir + '/%(name)s']
+}
+
+moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/c/cURL/cURL-7.37.1-foss-2014b.eb b/easybuild/easyconfigs/c/cURL/cURL-7.37.1-foss-2014b.eb
index 980fd8a13c40c8e7bdf8667b2947071d1ffcaf2c..8b024b363bd3a490de661270d6673c5ed34a5bec 100644
--- a/easybuild/easyconfigs/c/cURL/cURL-7.37.1-foss-2014b.eb
+++ b/easybuild/easyconfigs/c/cURL/cURL-7.37.1-foss-2014b.eb
@@ -16,7 +16,7 @@ toolchain = {'name': 'foss', 'version': '2014b'}
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = ['http://curl.haxx.se/download/']
 
-#dependencies = [('OpenSSL', '1.0.1i')] # OS dependency should be preferred for security reasons
+# dependencies = [('OpenSSL', '1.0.1i')] # OS dependency should be preferred for security reasons
 osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/c/cURL/cURL-7.37.1-foss-2015a.eb b/easybuild/easyconfigs/c/cURL/cURL-7.37.1-foss-2015a.eb
index fcbb0636e8c1ede344ef23413f38278c399d8d2a..6036dce5c2ecfc1cec9d0559c1f3c068df8e59c5 100644
--- a/easybuild/easyconfigs/c/cURL/cURL-7.37.1-foss-2015a.eb
+++ b/easybuild/easyconfigs/c/cURL/cURL-7.37.1-foss-2015a.eb
@@ -16,7 +16,7 @@ toolchain = {'name': 'foss', 'version': '2015a'}
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = ['http://curl.haxx.se/download/']
 
-#dependencies = [('OpenSSL', '1.0.1i')] # OS dependency should be preferred for security reasons
+# dependencies = [('OpenSSL', '1.0.1i')] # OS dependency should be preferred for security reasons
 osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/c/cURL/cURL-7.37.1-intel-2014b.eb b/easybuild/easyconfigs/c/cURL/cURL-7.37.1-intel-2014b.eb
index dfe1f4cd864c23ee10e0a8d3506fa97afa390ce3..196d06a19d1c29f8e2976d91c2da93b454e4987c 100644
--- a/easybuild/easyconfigs/c/cURL/cURL-7.37.1-intel-2014b.eb
+++ b/easybuild/easyconfigs/c/cURL/cURL-7.37.1-intel-2014b.eb
@@ -16,7 +16,7 @@ toolchain = {'name': 'intel', 'version': '2014b'}
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = ['http://curl.haxx.se/download/']
 
-#dependencies = [('OpenSSL', '1.0.1i')] # OS dependency should be preferred for security reasons
+# dependencies = [('OpenSSL', '1.0.1i')] # OS dependency should be preferred for security reasons
 osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/c/cURL/cURL-7.37.1-intel-2015a.eb b/easybuild/easyconfigs/c/cURL/cURL-7.37.1-intel-2015a.eb
index 5e1e3ebad8b461ba1b9507a3a1deabe5d0e882d3..119999d59e9c7cf04380abe386f758d20cc66df6 100644
--- a/easybuild/easyconfigs/c/cURL/cURL-7.37.1-intel-2015a.eb
+++ b/easybuild/easyconfigs/c/cURL/cURL-7.37.1-intel-2015a.eb
@@ -16,7 +16,7 @@ toolchain = {'name': 'intel', 'version': '2015a'}
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = ['http://curl.haxx.se/download/']
 
-#dependencies = [('OpenSSL', '1.0.1i')] # OS dependency should be preferred for security reasons
+# dependencies = [('OpenSSL', '1.0.1i')] # OS dependency should be preferred for security reasons
 osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/c/cURL/cURL-7.45.0-foss-2015b.eb b/easybuild/easyconfigs/c/cURL/cURL-7.45.0-foss-2015b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..dad17a39447434dfbaaebda584f4d14a1305e523
--- /dev/null
+++ b/easybuild/easyconfigs/c/cURL/cURL-7.45.0-foss-2015b.eb
@@ -0,0 +1,31 @@
+easyblock = 'ConfigureMake'
+
+name = 'cURL'
+version = '7.45.0'
+
+homepage = 'http://curl.haxx.se'
+description = """libcurl is a free and easy-to-use client-side URL transfer library,
+ supporting DICT, FILE, FTP, FTPS, Gopher, HTTP, HTTPS, IMAP, IMAPS, LDAP, LDAPS,
+ POP3, POP3S, RTMP, RTSP, SCP, SFTP, SMTP, SMTPS, Telnet and TFTP. libcurl supports
+ SSL certificates, HTTP POST, HTTP PUT, FTP uploading, HTTP form based upload,
+ proxies, cookies, user+password authentication (Basic, Digest, NTLM, Negotiate,
+ Kerberos), file transfer resume, http proxy tunneling and more."""
+
+toolchain = {'name': 'foss', 'version': '2015b'}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://curl.haxx.se/download/']
+
+osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
+
+# dependencies = [('OpenSSL', '1.0.1p')]
+# configopts = "--with-ssl=$EBROOTOPENSSL"
+
+modextravars = {'CURL_INCLUDES': '%(installdir)s/include'}
+
+sanity_check_paths = {
+    'files': ['bin/curl', 'lib/libcurl.a', 'lib/libcurl.so'],
+    'dirs': ['lib/pkgconfig'],
+}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/c/cURL/cURL-7.46.0-foss-2015a.eb b/easybuild/easyconfigs/c/cURL/cURL-7.46.0-foss-2015a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..db4a8f582604258dd25efcefba409d63e8154be8
--- /dev/null
+++ b/easybuild/easyconfigs/c/cURL/cURL-7.46.0-foss-2015a.eb
@@ -0,0 +1,31 @@
+easyblock = 'ConfigureMake'
+
+name = 'cURL'
+version = '7.46.0'
+
+homepage = 'http://curl.haxx.se'
+description = """libcurl is a free and easy-to-use client-side URL transfer library,
+ supporting DICT, FILE, FTP, FTPS, Gopher, HTTP, HTTPS, IMAP, IMAPS, LDAP, LDAPS,
+ POP3, POP3S, RTMP, RTSP, SCP, SFTP, SMTP, SMTPS, Telnet and TFTP. libcurl supports
+ SSL certificates, HTTP POST, HTTP PUT, FTP uploading, HTTP form based upload,
+ proxies, cookies, user+password authentication (Basic, Digest, NTLM, Negotiate,
+ Kerberos), file transfer resume, http proxy tunneling and more."""
+
+toolchain = {'name': 'foss', 'version': '2015a'}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://curl.haxx.se/download/']
+
+osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
+
+# dependencies = [('OpenSSL', '1.0.1p')]
+# configopts = "--with-ssl=$EBROOTOPENSSL"
+
+modextravars = {'CURL_INCLUDES': '%(installdir)s/include'}
+
+sanity_check_paths = {
+    'files': ['bin/curl', 'lib/libcurl.a', 'lib/libcurl.%s' % SHLIB_EXT],
+    'dirs': ['lib/pkgconfig'],
+}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/c/cairo/cairo-1.14.6-intel-2016a.eb b/easybuild/easyconfigs/c/cairo/cairo-1.14.6-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..0a62de36aa1beeb743bb0efd624510970f9ace5f
--- /dev/null
+++ b/easybuild/easyconfigs/c/cairo/cairo-1.14.6-intel-2016a.eb
@@ -0,0 +1,45 @@
+easyblock = 'ConfigureMake'
+
+name = 'cairo'
+version = '1.14.6'
+
+homepage = 'http://cairographics.org'
+description = """Cairo is a 2D graphics library with support for multiple output devices.
+ Currently supported output targets include the X Window System (via both Xlib and XCB), Quartz, Win32, image buffers,
+ PostScript, PDF, and SVG file output. Experimental backends include OpenGL, BeOS, OS/2, and DirectFB"""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+source_urls = ['http://cairographics.org/releases/']
+sources = [SOURCE_TAR_XZ]
+
+glibver = '2.47.5'
+
+dependencies = [
+    ('bzip2', '1.0.6'),
+    ('zlib', '1.2.8'),
+    ('libpng', '1.6.21'),
+    ('freetype', '2.6.2'),
+    ('pixman', '0.34.0'),
+    ('fontconfig', '2.11.94'),
+    ('expat', '2.1.0'),
+    ('GLib', glibver),
+]
+
+# disable symbol lookup, which requires -lbfd, to avoid link issues with (non-PIC) libiberty.a provided by GCC
+configopts = "--enable-symbol-lookup=no --enable-gobject=yes --enable-svg=yes --enable-tee=yes "
+
+# workaround for "hidden symbol .* in .* is referenced by DSO" and "ld: final link failed: Bad value"
+buildopts = 'LD="$CC" LDFLAGS="$LDFLAGS -shared-intel"'
+
+sanity_check_paths = {
+    'files': ['bin/cairo-trace', 'lib/cairo/libcairo-trace.so', 'lib/cairo/libcairo-trace.a',
+              'lib/libcairo.a', 'lib/libcairo-gobject.a', 'lib/libcairo-script-interpreter.a',
+              'lib/libcairo-gobject.so', 'lib/libcairo-script-interpreter.so', 'lib/libcairo.so'] +
+             ['include/cairo/cairo%s.h' % x for x in ['', '-deprecated', '-features', '-ft', '-gobject', '-pdf', '-ps',
+                                                      '-script', '-script-interpreter', '-svg', '-version', '-xcb',
+                                                      '-xlib', '-xlib-xrender']],
+    'dirs': ['lib/pkgconfig'],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/c/ccache/ccache-3.1.9-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/c/ccache/ccache-3.1.9-goalf-1.1.0-no-OFED.eb
index 48fcc47836307819f59e375ff2e71f45514e236c..bbabdb92a5bb91fc7c06ccb75100dcfcc9e3996b 100644
--- a/easybuild/easyconfigs/c/ccache/ccache-3.1.9-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/c/ccache/ccache-3.1.9-goalf-1.1.0-no-OFED.eb
@@ -21,8 +21,8 @@ source_urls = ['http://samba.org/ftp/ccache/']
 toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
 
 sanity_check_paths = {
-                      'files': ['bin/ccache'],
-                      'dirs': []
-                     }
+    'files': ['bin/ccache'],
+    'dirs': []
+}
 
 moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/c/ccache/ccache-3.1.9-goolf-1.4.10.eb b/easybuild/easyconfigs/c/ccache/ccache-3.1.9-goolf-1.4.10.eb
index b642a5d551a80e47129975d862504ff486919a4d..3bf08594dade5bb208ad543a0d55ced42ceb0c79 100644
--- a/easybuild/easyconfigs/c/ccache/ccache-3.1.9-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/c/ccache/ccache-3.1.9-goolf-1.4.10.eb
@@ -21,8 +21,8 @@ source_urls = ['http://samba.org/ftp/ccache/']
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 
 sanity_check_paths = {
-                      'files': ['bin/ccache'],
-                      'dirs': []
-                     }
+    'files': ['bin/ccache'],
+    'dirs': []
+}
 
 moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/c/ccache/ccache-3.1.9-ictce-4.0.6.eb b/easybuild/easyconfigs/c/ccache/ccache-3.1.9-ictce-4.0.6.eb
index 4137d5afc828ca0371083923fae2844f9d66bf0f..3011b90d1708fada7ac55372d4525da768a8ad60 100644
--- a/easybuild/easyconfigs/c/ccache/ccache-3.1.9-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/c/ccache/ccache-3.1.9-ictce-4.0.6.eb
@@ -21,9 +21,8 @@ source_urls = ['http://samba.org/ftp/ccache/']
 toolchain = {'version': '4.0.6', 'name': 'ictce'}
 
 sanity_check_paths = {
-                      'files': ['bin/ccache'],
-                      'dirs': []
-                     }
+    'files': ['bin/ccache'],
+    'dirs': []
+}
 
 moduleclass = 'tools'
-
diff --git a/easybuild/easyconfigs/c/ccache/ccache-3.1.9-ictce-5.3.0.eb b/easybuild/easyconfigs/c/ccache/ccache-3.1.9-ictce-5.3.0.eb
index b15c9ceaf915a0de1b123f9d4a2e10c23530b414..84c3e7baf8976c4a1ac0b268c5cb6cd21ed0a6ef 100644
--- a/easybuild/easyconfigs/c/ccache/ccache-3.1.9-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/c/ccache/ccache-3.1.9-ictce-5.3.0.eb
@@ -22,9 +22,8 @@ source_urls = ['http://samba.org/ftp/ccache/']
 toolchain = {'name': 'ictce', 'version': '5.3.0'}
 
 sanity_check_paths = {
-                      'files': ['bin/ccache'],
-                      'dirs': []
-                     }
+    'files': ['bin/ccache'],
+    'dirs': []
+}
 
 moduleclass = 'tools'
-
diff --git a/easybuild/easyconfigs/c/cflow/cflow-1.4-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/c/cflow/cflow-1.4-goalf-1.1.0-no-OFED.eb
index 315f43e190d51684e41fe86c15bd74ad022fd93e..98800f3677094c16f98f18e446dc53b907ea38c1 100644
--- a/easybuild/easyconfigs/c/cflow/cflow-1.4-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/c/cflow/cflow-1.4-goalf-1.1.0-no-OFED.eb
@@ -22,8 +22,8 @@ source_urls = [GNU_SOURCE]
 toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
 
 sanity_check_paths = {
-                      'files': ['bin/cflow'],
-                      'dirs': []
-                     }
+    'files': ['bin/cflow'],
+    'dirs': []
+}
 
 moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/c/cflow/cflow-1.4-goolf-1.4.10.eb b/easybuild/easyconfigs/c/cflow/cflow-1.4-goolf-1.4.10.eb
index 501b5edd24789f596e5d4c2cb7fdc2987631711a..bb9da36f809070bcfb07a563009a7f7944a35c4b 100644
--- a/easybuild/easyconfigs/c/cflow/cflow-1.4-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/c/cflow/cflow-1.4-goolf-1.4.10.eb
@@ -22,8 +22,8 @@ source_urls = [GNU_SOURCE]
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 
 sanity_check_paths = {
-                      'files': ['bin/cflow'],
-                      'dirs': []
-                     }
+    'files': ['bin/cflow'],
+    'dirs': []
+}
 
 moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/c/cflow/cflow-1.4-ictce-4.0.6.eb b/easybuild/easyconfigs/c/cflow/cflow-1.4-ictce-4.0.6.eb
index 7c2775cbce86e2ce85d10420f9d573082f5a8aeb..a3e495b0c6915ce9bf977b67961c4f5cd57438fc 100644
--- a/easybuild/easyconfigs/c/cflow/cflow-1.4-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/c/cflow/cflow-1.4-ictce-4.0.6.eb
@@ -22,9 +22,8 @@ source_urls = [GNU_SOURCE]
 toolchain = {'version': '4.0.6', 'name': 'ictce'}
 
 sanity_check_paths = {
-                      'files': ['bin/cflow'],
-                      'dirs': []
-                     }
+    'files': ['bin/cflow'],
+    'dirs': []
+}
 
 moduleclass = 'tools'
-
diff --git a/easybuild/easyconfigs/c/cflow/cflow-1.4-ictce-5.3.0.eb b/easybuild/easyconfigs/c/cflow/cflow-1.4-ictce-5.3.0.eb
index 848eb6e89975af24c6c20c5941c7015a76ca2802..107d08647f5b251b367e43160f1efbaaadeb4867 100644
--- a/easybuild/easyconfigs/c/cflow/cflow-1.4-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/c/cflow/cflow-1.4-ictce-5.3.0.eb
@@ -23,9 +23,8 @@ source_urls = [GNU_SOURCE]
 toolchain = {'name': 'ictce', 'version': '5.3.0'}
 
 sanity_check_paths = {
-                      'files': ['bin/cflow'],
-                      'dirs': []
-                     }
+    'files': ['bin/cflow'],
+    'dirs': []
+}
 
 moduleclass = 'tools'
-
diff --git a/easybuild/easyconfigs/c/cgdb/cgdb-0.6.5-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/c/cgdb/cgdb-0.6.5-goalf-1.1.0-no-OFED.eb
index 5a1aea2fb7d2bc3d079c3288e4f3284b72ea0aa7..2112acc09695b87bd93eb95920a91ec27d73929b 100644
--- a/easybuild/easyconfigs/c/cgdb/cgdb-0.6.5-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/c/cgdb/cgdb-0.6.5-goalf-1.1.0-no-OFED.eb
@@ -21,13 +21,13 @@ source_urls = ['http://sourceforge.net/projects/cgdb/files', 'download']
 toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
 
 dependencies = [
-                ('ncurses', '5.9'),
-                ('libreadline', '6.2')
-               ]
+    ('ncurses', '5.9'),
+    ('libreadline', '6.2')
+]
 
 sanity_check_paths = {
-                      'files': ['bin/cgdb'],
-                      'dirs': []
-                     }
+    'files': ['bin/cgdb'],
+    'dirs': []
+}
 
 moduleclass = 'debugger'
diff --git a/easybuild/easyconfigs/c/cgdb/cgdb-0.6.5-goolf-1.4.10.eb b/easybuild/easyconfigs/c/cgdb/cgdb-0.6.5-goolf-1.4.10.eb
index 5efc1c2d3ca161203507eaa94d5c65e36d92405a..9684225cb765a4dfd9bc485f53e3c31049c7f0bb 100644
--- a/easybuild/easyconfigs/c/cgdb/cgdb-0.6.5-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/c/cgdb/cgdb-0.6.5-goolf-1.4.10.eb
@@ -21,13 +21,13 @@ source_urls = ['http://sourceforge.net/projects/cgdb/files', 'download']
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 
 dependencies = [
-                ('ncurses', '5.9'),
-                ('libreadline', '6.2')
-               ]
+    ('ncurses', '5.9'),
+    ('libreadline', '6.2')
+]
 
 sanity_check_paths = {
-                      'files': ['bin/cgdb'],
-                      'dirs': []
-                     }
+    'files': ['bin/cgdb'],
+    'dirs': []
+}
 
 moduleclass = 'debugger'
diff --git a/easybuild/easyconfigs/c/cgdb/cgdb-0.6.5-ictce-4.0.6.eb b/easybuild/easyconfigs/c/cgdb/cgdb-0.6.5-ictce-4.0.6.eb
index b3656ba859dd8a782950c67294bd82555b20c297..3cff32f247c9e6c47a91f4ab4fd3131907bcbd1a 100644
--- a/easybuild/easyconfigs/c/cgdb/cgdb-0.6.5-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/c/cgdb/cgdb-0.6.5-ictce-4.0.6.eb
@@ -21,13 +21,13 @@ source_urls = ['http://sourceforge.net/projects/cgdb/files', 'download']
 toolchain = {'version': '4.0.6', 'name': 'ictce'}
 
 dependencies = [
-                ('ncurses', '5.9'),
-                ('libreadline', '6.2')
-               ]
+    ('ncurses', '5.9'),
+    ('libreadline', '6.2')
+]
 
 sanity_check_paths = {
-                      'files': ['bin/cgdb'],
-                      'dirs': []
-                     }
+    'files': ['bin/cgdb'],
+    'dirs': []
+}
 
 moduleclass = 'debugger'
diff --git a/easybuild/easyconfigs/c/cgdb/cgdb-0.6.5-ictce-5.3.0.eb b/easybuild/easyconfigs/c/cgdb/cgdb-0.6.5-ictce-5.3.0.eb
index c3ce823fd97275f17cbd43765be4cfa9dc7b904b..eb6eb8ffbf17dd8df2f6ca1ec83fa5598b0facc5 100644
--- a/easybuild/easyconfigs/c/cgdb/cgdb-0.6.5-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/c/cgdb/cgdb-0.6.5-ictce-5.3.0.eb
@@ -22,13 +22,13 @@ source_urls = ['http://sourceforge.net/projects/cgdb/files', 'download']
 toolchain = {'name': 'ictce', 'version': '5.3.0'}
 
 dependencies = [
-                ('ncurses', '5.9'),
-                ('libreadline', '6.2')
-               ]
+    ('ncurses', '5.9'),
+    ('libreadline', '6.2')
+]
 
 sanity_check_paths = {
-                      'files': ['bin/cgdb'],
-                      'dirs': []
-                     }
+    'files': ['bin/cgdb'],
+    'dirs': []
+}
 
 moduleclass = 'debugger'
diff --git a/easybuild/easyconfigs/c/ctffind/ctffind-4.0.17-intel-2015b.eb b/easybuild/easyconfigs/c/ctffind/ctffind-4.0.17-intel-2015b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..c378da306a5e28ede1a90393432053ef32fb3224
--- /dev/null
+++ b/easybuild/easyconfigs/c/ctffind/ctffind-4.0.17-intel-2015b.eb
@@ -0,0 +1,38 @@
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+# Author: Pablo Escobar Lopez
+# sciCORE - University of Basel
+# SIB Swiss Institute of Bioinformatics 
+
+easyblock = 'MakeCp'
+
+name = 'ctffind'
+version = '4.0.17'
+
+homepage = 'http://grigoriefflab.janelia.org/ctffind4'
+description = """program for finding CTFs of electron micrographs"""
+
+toolchain = {'name': 'intel', 'version': '2015b'}
+toolchainopts = {'openmp': True}
+
+source_urls = ['http://grigoriefflab.janelia.org/sites/default/files/']
+sources = [SOURCELOWER_TAR_GZ]
+
+dependencies = [('GSL', '1.16')]
+
+# when running ./configure in the root folder it fails.
+# application doesn't provide a 'make install'
+prebuildopts = 'mkdir build && cd build && '
+prebuildopts += ' ../configure --enable-static --disable-debug --enable-optimisations --enable-openmp FC=${FC} F77=${F77} && '
+
+files_to_copy = [(['build/ctffind'], 'bin'), 'doc', 'scripts']
+
+parallel = 1
+                
+sanity_check_paths = {
+    'files': ['bin/ctffind'],
+    'dirs': [],
+}
+
+modloadmsg = """Define OMP_NUM_THREADS or use the command line option --omp-num-threads=N when using this application"""
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/c/ctffind/ctffind-4.0.8-intel-2014b.eb b/easybuild/easyconfigs/c/ctffind/ctffind-4.0.8-intel-2014b.eb
index 70b9a6c76d450314b06ba112e93c223ccedb3f0f..6af0d9536021d50f94660bdc8239e1ae869a103f 100644
--- a/easybuild/easyconfigs/c/ctffind/ctffind-4.0.8-intel-2014b.eb
+++ b/easybuild/easyconfigs/c/ctffind/ctffind-4.0.8-intel-2014b.eb
@@ -1,4 +1,4 @@
-easyblock='MakeCp'
+easyblock = 'MakeCp'
 
 name = 'ctffind'
 version = '4.0.8'
diff --git a/easybuild/easyconfigs/c/cutadapt/cutadapt-1.3-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/c/cutadapt/cutadapt-1.3-goolf-1.4.10-Python-2.7.3.eb
index 59cb6d8b45ea6960dc91f3805fcedfb944c30ec1..d487d344f68c2418b5e6237e98eb2754e7a0fee0 100644
--- a/easybuild/easyconfigs/c/cutadapt/cutadapt-1.3-goolf-1.4.10-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/c/cutadapt/cutadapt-1.3-goolf-1.4.10-Python-2.7.3.eb
@@ -31,7 +31,7 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files': ['bin/cutadapt','lib/python2.7/site-packages/cutadapt/calign.%s' % SHLIB_EXT,],
+    'files': ['bin/cutadapt', 'lib/python2.7/site-packages/cutadapt/calign.%s' % SHLIB_EXT],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/c/cutadapt/cutadapt-1.3-goolf-1.4.10-Python-2.7.5.eb b/easybuild/easyconfigs/c/cutadapt/cutadapt-1.3-goolf-1.4.10-Python-2.7.5.eb
index f90288e47d5a3aad10ef4b9ea93ba09f06cc4951..aceb217de4bbfa5d6c0c8dbdeb6f67d1f4f6bc5c 100644
--- a/easybuild/easyconfigs/c/cutadapt/cutadapt-1.3-goolf-1.4.10-Python-2.7.5.eb
+++ b/easybuild/easyconfigs/c/cutadapt/cutadapt-1.3-goolf-1.4.10-Python-2.7.5.eb
@@ -31,7 +31,7 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files': ['bin/cutadapt','lib/python2.7/site-packages/cutadapt/calign.%s' % SHLIB_EXT,],
+    'files': ['bin/cutadapt', 'lib/python2.7/site-packages/cutadapt/calign.%s' % SHLIB_EXT],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/c/cutadapt/cutadapt-1.4.1-foss-2014b-Python-2.7.8.eb b/easybuild/easyconfigs/c/cutadapt/cutadapt-1.4.1-foss-2014b-Python-2.7.8.eb
index a308b2113040ca38bca418c17a7269a85b9641d2..9d2802684e4256bd65c38f334447f8330712656a 100644
--- a/easybuild/easyconfigs/c/cutadapt/cutadapt-1.4.1-foss-2014b-Python-2.7.8.eb
+++ b/easybuild/easyconfigs/c/cutadapt/cutadapt-1.4.1-foss-2014b-Python-2.7.8.eb
@@ -29,9 +29,8 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files': ['bin/cutadapt',],
+    'files': ['bin/cutadapt'],
     'dirs': [],
 }
 
 moduleclass = 'bio'
-
diff --git a/easybuild/easyconfigs/c/cutadapt/cutadapt-1.5-foss-2014b-Python-2.7.8.eb b/easybuild/easyconfigs/c/cutadapt/cutadapt-1.5-foss-2014b-Python-2.7.8.eb
index 3303167a212712132abd6fe76644e37bd751796f..edcade804404d5db7af0eb6e827e27a31a096a1d 100644
--- a/easybuild/easyconfigs/c/cutadapt/cutadapt-1.5-foss-2014b-Python-2.7.8.eb
+++ b/easybuild/easyconfigs/c/cutadapt/cutadapt-1.5-foss-2014b-Python-2.7.8.eb
@@ -29,9 +29,8 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files': ['bin/cutadapt',],
+    'files': ['bin/cutadapt'],
     'dirs': [],
 }
 
 moduleclass = 'bio'
-
diff --git a/easybuild/easyconfigs/c/cutadapt/cutadapt-1.5-goolf-1.4.10-Python-2.7.10.eb b/easybuild/easyconfigs/c/cutadapt/cutadapt-1.5-goolf-1.4.10-Python-2.7.10.eb
index 1d7c0f2ab8d3bf4b71f27c9b706800278c6d7b73..141aedc7d3d5b009aca935d9680ddb6a708ba2af 100644
--- a/easybuild/easyconfigs/c/cutadapt/cutadapt-1.5-goolf-1.4.10-Python-2.7.10.eb
+++ b/easybuild/easyconfigs/c/cutadapt/cutadapt-1.5-goolf-1.4.10-Python-2.7.10.eb
@@ -26,7 +26,7 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files': ['lib/python%s/site-packages/cutadapt/_align.so' % pyshortver],
+    'files': ['lib/python%s/site-packages/cutadapt/_align.%s' % (pyshortver, SHLIB_EXT)],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/c/cutadapt/cutadapt-1.5-intel-2014b-Python-2.7.8.eb b/easybuild/easyconfigs/c/cutadapt/cutadapt-1.5-intel-2014b-Python-2.7.8.eb
index dbc8a13634a2d846553c2d1832fb3e1671a92b60..c50c4a1b5f880d9d45b1dd343d2d9c8263b36b3d 100644
--- a/easybuild/easyconfigs/c/cutadapt/cutadapt-1.5-intel-2014b-Python-2.7.8.eb
+++ b/easybuild/easyconfigs/c/cutadapt/cutadapt-1.5-intel-2014b-Python-2.7.8.eb
@@ -26,7 +26,7 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files': ['bin/cutadapt','lib/python%s/site-packages/cutadapt/_align.so' % pyshortver],
+    'files': ['bin/cutadapt', 'lib/python%s/site-packages/cutadapt/_align.%s' % (pyshortver, SHLIB_EXT)],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/c/cutadapt/cutadapt-1.6-foss-2014b-Python-2.7.8.eb b/easybuild/easyconfigs/c/cutadapt/cutadapt-1.6-foss-2014b-Python-2.7.8.eb
index 83a8d8a50d11fa0846f0cf9ac57baa009790cdb3..6d660f5bc5759bfa8c74125df699be66f22aa5f1 100644
--- a/easybuild/easyconfigs/c/cutadapt/cutadapt-1.6-foss-2014b-Python-2.7.8.eb
+++ b/easybuild/easyconfigs/c/cutadapt/cutadapt-1.6-foss-2014b-Python-2.7.8.eb
@@ -29,9 +29,8 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files': ['bin/cutadapt',],
+    'files': ['bin/cutadapt'],
     'dirs': [],
 }
 
 moduleclass = 'bio'
-
diff --git a/easybuild/easyconfigs/c/cutadapt/cutadapt-1.7-foss-2014b-Python-2.7.8.eb b/easybuild/easyconfigs/c/cutadapt/cutadapt-1.7-foss-2014b-Python-2.7.8.eb
index f879b0939f257bf5e3af32327d0e82496bcb12b9..7e135e50214c14aa0f5cb77f4a8eccc7e5e019a9 100644
--- a/easybuild/easyconfigs/c/cutadapt/cutadapt-1.7-foss-2014b-Python-2.7.8.eb
+++ b/easybuild/easyconfigs/c/cutadapt/cutadapt-1.7-foss-2014b-Python-2.7.8.eb
@@ -29,9 +29,8 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files': ['bin/cutadapt',],
+    'files': ['bin/cutadapt'],
     'dirs': [],
 }
 
 moduleclass = 'bio'
-
diff --git a/easybuild/easyconfigs/c/cutadapt/cutadapt-1.7.1-foss-2014b-Python-2.7.8.eb b/easybuild/easyconfigs/c/cutadapt/cutadapt-1.7.1-foss-2014b-Python-2.7.8.eb
index 60048badc4d91fb70bc781525ab151f81450f1bc..ccfea593725c8b24ee0f475ea82fa5ec76d0c048 100644
--- a/easybuild/easyconfigs/c/cutadapt/cutadapt-1.7.1-foss-2014b-Python-2.7.8.eb
+++ b/easybuild/easyconfigs/c/cutadapt/cutadapt-1.7.1-foss-2014b-Python-2.7.8.eb
@@ -29,9 +29,8 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files': ['bin/cutadapt',],
+    'files': ['bin/cutadapt'],
     'dirs': [],
 }
 
 moduleclass = 'bio'
-
diff --git a/easybuild/easyconfigs/c/cutadapt/cutadapt-1.8.1-intel-2015a-Python-2.7.9.eb b/easybuild/easyconfigs/c/cutadapt/cutadapt-1.8.1-intel-2015a-Python-2.7.9.eb
index a69f7bc2f85b976d02ba71f12be0640ed56d3347..8898d1ce85b464d328d07ff9e6c87d14e5ea96a0 100644
--- a/easybuild/easyconfigs/c/cutadapt/cutadapt-1.8.1-intel-2015a-Python-2.7.9.eb
+++ b/easybuild/easyconfigs/c/cutadapt/cutadapt-1.8.1-intel-2015a-Python-2.7.9.eb
@@ -29,7 +29,7 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files': ['bin/cutadapt','lib/python%s/site-packages/cutadapt/_align.so' % pyshortver],
+    'files': ['bin/cutadapt', 'lib/python%s/site-packages/cutadapt/_align.%s' % (pyshortver, SHLIB_EXT)],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/c/cutadapt/cutadapt-1.9.1-foss-2015b-Python-2.7.10.eb b/easybuild/easyconfigs/c/cutadapt/cutadapt-1.9.1-foss-2015b-Python-2.7.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..6c74a88bb40ae4186d0d68dfdfd4f2e443e3eb43
--- /dev/null
+++ b/easybuild/easyconfigs/c/cutadapt/cutadapt-1.9.1-foss-2015b-Python-2.7.10.eb
@@ -0,0 +1,37 @@
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+# Author: Pablo Escobar Lopez
+# Swiss Institute of Bioinformatics (SIB)
+# Biozentrum - University of Basel
+# Author: Adam Huffman
+# The Francis Crick Institute
+
+easyblock = "PythonPackage"
+
+name = 'cutadapt'
+version = '1.9.1'
+
+homepage = 'http://opensource.scilifelab.se/projects/cutadapt/'
+description = """ Cutadapt finds and removes adapter sequences, primers, poly-A tails and
+ other types of unwanted sequence from your high-throughput sequencing reads. """
+
+toolchain = {'name': 'foss', 'version': '2015b'}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCELOWER_TAR_GZ]
+
+python = 'Python'
+pyver = '2.7.10'
+pyshortver = '.'.join(pyver.split('.')[:2])
+
+versionsuffix = "-%s-%s" % (python, pyver)
+
+dependencies = [
+    (python, pyver),
+]
+
+sanity_check_paths = {
+    'files': ['bin/cutadapt', 'lib/python%s/site-packages/cutadapt/_align.%s' % (pyshortver, SHLIB_EXT)],
+    'dirs': [],
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/d/DB/DB-4.8.30-goolf-1.4.10.eb b/easybuild/easyconfigs/d/DB/DB-4.8.30-goolf-1.4.10.eb
index bebd11184253e258be23ab7e6d84fefece08988e..f567e411fb53fa9aa8fa2956f2ab4fae4481d87e 100644
--- a/easybuild/easyconfigs/d/DB/DB-4.8.30-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/d/DB/DB-4.8.30-goolf-1.4.10.eb
@@ -7,12 +7,12 @@ description = """Berkeley DB enables the development of custom data management s
 
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 
-# download via http://www.oracle.com/technetwork/products/berkeleydb/downloads/, requires registration
+source_urls = ['http://download.oracle.com/berkeley-db/']
 sources = [SOURCELOWER_TAR_GZ]
 
 sanity_check_paths = {
-    'files': ["include/db.h"],
-    'dirs': [],
+    'files': ['include/db.h', 'include/db_cxx.h', 'lib/libdb.a', 'lib/libdb.%s' % SHLIB_EXT],
+    'dirs': ['bin'],
 }
 
 moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/d/DB/DB-4.8.30-ictce-5.5.0.eb b/easybuild/easyconfigs/d/DB/DB-4.8.30-ictce-5.5.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..42d43b6f8ef532aa7d04ca9a6b539e0ebba77bb6
--- /dev/null
+++ b/easybuild/easyconfigs/d/DB/DB-4.8.30-ictce-5.5.0.eb
@@ -0,0 +1,18 @@
+name = 'DB'
+version = '4.8.30'
+
+homepage = 'http://www.oracle.com/technetwork/products/berkeleydb'
+description = """Berkeley DB enables the development of custom data management solutions,
+ without the overhead traditionally associated with such custom projects."""
+
+toolchain = {'name': 'ictce', 'version': '5.5.0'}
+
+source_urls = ['http://download.oracle.com/berkeley-db/']
+sources = [SOURCELOWER_TAR_GZ]
+
+sanity_check_paths = {
+    'files': ['include/db.h', 'include/db_cxx.h', 'lib/libdb.a', 'lib/libdb.%s' % SHLIB_EXT],
+    'dirs': ['bin'],
+}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/d/DB/DB-4.8.30-intel-2015b.eb b/easybuild/easyconfigs/d/DB/DB-4.8.30-intel-2015b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..0155873f3f79eea586d99b5f429846381f0e43b3
--- /dev/null
+++ b/easybuild/easyconfigs/d/DB/DB-4.8.30-intel-2015b.eb
@@ -0,0 +1,18 @@
+name = 'DB'
+version = '4.8.30'
+
+homepage = 'http://www.oracle.com/technetwork/products/berkeleydb'
+description = """Berkeley DB enables the development of custom data management solutions,
+ without the overhead traditionally associated with such custom projects."""
+
+toolchain = {'name': 'intel', 'version': '2015b'}
+
+source_urls = ['http://download.oracle.com/berkeley-db/']
+sources = [SOURCELOWER_TAR_GZ]
+
+sanity_check_paths = {
+    'files': ['include/db.h', 'include/db_cxx.h', 'lib/libdb.a', 'lib/libdb.%s' % SHLIB_EXT],
+    'dirs': ['bin'],
+}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/d/DB/DB-4.8.30-intel-2016a.eb b/easybuild/easyconfigs/d/DB/DB-4.8.30-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..aec133eedfd174df658564d2b00f5ffd9f1e61e3
--- /dev/null
+++ b/easybuild/easyconfigs/d/DB/DB-4.8.30-intel-2016a.eb
@@ -0,0 +1,18 @@
+name = 'DB'
+version = '4.8.30'
+
+homepage = 'http://www.oracle.com/technetwork/products/berkeleydb'
+description = """Berkeley DB enables the development of custom data management solutions,
+ without the overhead traditionally associated with such custom projects."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+source_urls = ['http://download.oracle.com/berkeley-db/']
+sources = [SOURCELOWER_TAR_GZ]
+
+sanity_check_paths = {
+    'files': ['include/db.h', 'include/db_cxx.h', 'lib/libdb.a', 'lib/libdb.%s' % SHLIB_EXT],
+    'dirs': ['bin'],
+}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/d/DB_File/DB_File-1.831-ictce-5.5.0-Perl-5.18.2.eb b/easybuild/easyconfigs/d/DB_File/DB_File-1.831-ictce-5.5.0-Perl-5.18.2.eb
index bdcb00e69d1f7d3d754727227733019e25c1498f..babf824aa11b25b54942b0150d4403994d823dc0 100644
--- a/easybuild/easyconfigs/d/DB_File/DB_File-1.831-ictce-5.5.0-Perl-5.18.2.eb
+++ b/easybuild/easyconfigs/d/DB_File/DB_File-1.831-ictce-5.5.0-Perl-5.18.2.eb
@@ -2,6 +2,7 @@ easyblock = 'PerlModule'
 
 name = 'DB_File'
 version = '1.831'
+versionsuffix = '-Perl-%(perlver)s'
 
 homepage = 'http://perldoc.perl.org/DB_File.html'
 description = """Perl5 access to Berkeley DB version 1.x."""
@@ -11,19 +12,13 @@ toolchain = {'name': 'ictce', 'version': '5.5.0'}
 source_urls = ['http://www.cpan.org/modules/by-module/DB_File/PMQS']
 sources = [SOURCE_TAR_GZ]
 
-dependencies = [('DB', '2.7.7')]
-
-perl = 'Perl'
-perlver = '5.18.2'
-versionsuffix = '-%s-%s' % (perl, perlver)
-
 dependencies = [
-    (perl, perlver),
+    ('Perl', '5.18.2'),
+    ('DB', '4.8.30'),
 ]
 
-perlmajver = perlver.split('.')[0]
 sanity_check_paths = {
-    'files': ['lib/perl%s/site_perl/%s/x86_64-linux-thread-multi/DB_File.pm' % (perlmajver, perlver)],
+    'files': ['lib/perl5/site_perl/%(perlver)s/x86_64-linux-thread-multi/DB_File.pm'],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/d/DB_File/DB_File-1.831-ictce-5.5.0-Perl-5.20.0.eb b/easybuild/easyconfigs/d/DB_File/DB_File-1.831-ictce-5.5.0-Perl-5.20.0.eb
index 831d1e849462cc3bbfc6e0863e1192a0b1882286..2eb7bd63e2775d01397a04a660a0f71c0c9987c2 100644
--- a/easybuild/easyconfigs/d/DB_File/DB_File-1.831-ictce-5.5.0-Perl-5.20.0.eb
+++ b/easybuild/easyconfigs/d/DB_File/DB_File-1.831-ictce-5.5.0-Perl-5.20.0.eb
@@ -2,6 +2,7 @@ easyblock = 'PerlModule'
 
 name = 'DB_File'
 version = '1.831'
+versionsuffix = '-Perl-%(perlver)s'
 
 homepage = 'http://perldoc.perl.org/DB_File.html'
 description = """Perl5 access to Berkeley DB version 1.x."""
@@ -11,19 +12,13 @@ toolchain = {'name': 'ictce', 'version': '5.5.0'}
 source_urls = ['http://www.cpan.org/modules/by-module/DB_File/PMQS']
 sources = [SOURCE_TAR_GZ]
 
-dependencies = [('DB', '2.7.7')]
-
-perl = 'Perl'
-perlver = '5.20.0'
-versionsuffix = '-%s-%s' % (perl, perlver)
-
 dependencies = [
-    (perl, perlver),
+    ('Perl', '5.20.0'),
+    ('DB', '4.8.30'),
 ]
 
-perlmajver = perlver.split('.')[0]
 sanity_check_paths = {
-    'files': ['lib/perl%s/site_perl/%s/x86_64-linux-thread-multi/DB_File.pm' % (perlmajver, perlver)],
+    'files': ['lib/perl5/site_perl/%(perlver)s/x86_64-linux-thread-multi/DB_File.pm'],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/d/DB_File/DB_File-1.831-intel-2015b-Perl-5.20.3.eb b/easybuild/easyconfigs/d/DB_File/DB_File-1.831-intel-2015b-Perl-5.20.3.eb
new file mode 100644
index 0000000000000000000000000000000000000000..7a984ebf4c031bd027d6a66dbc85d2aac530b4b1
--- /dev/null
+++ b/easybuild/easyconfigs/d/DB_File/DB_File-1.831-intel-2015b-Perl-5.20.3.eb
@@ -0,0 +1,25 @@
+easyblock = 'PerlModule'
+
+name = 'DB_File'
+version = '1.831'
+versionsuffix = '-Perl-%(perlver)s'
+
+homepage = 'http://perldoc.perl.org/DB_File.html'
+description = """Perl5 access to Berkeley DB version 1.x."""
+
+toolchain = {'name': 'intel', 'version': '2015b'}
+
+source_urls = ['http://www.cpan.org/modules/by-module/DB_File/PMQS']
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [
+    ('Perl', '5.20.3'),
+    ('DB', '4.8.30'),
+]
+
+sanity_check_paths = {
+    'files': ['lib/perl5/site_perl/%(perlver)s/x86_64-linux-thread-multi/DB_File.pm'],
+    'dirs': [],
+}
+
+moduleclass = 'data'
diff --git a/easybuild/easyconfigs/d/DB_File/DB_File-1.835-intel-2016a-Perl-5.20.3.eb b/easybuild/easyconfigs/d/DB_File/DB_File-1.835-intel-2016a-Perl-5.20.3.eb
new file mode 100644
index 0000000000000000000000000000000000000000..c1d977b9e287294bc92e628793927ed490589a2a
--- /dev/null
+++ b/easybuild/easyconfigs/d/DB_File/DB_File-1.835-intel-2016a-Perl-5.20.3.eb
@@ -0,0 +1,25 @@
+easyblock = 'PerlModule'
+
+name = 'DB_File'
+version = '1.835'
+versionsuffix = '-Perl-%(perlver)s'
+
+homepage = 'http://perldoc.perl.org/DB_File.html'
+description = """Perl5 access to Berkeley DB version 1.x."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+source_urls = ['http://www.cpan.org/modules/by-module/DB_File/PMQS']
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [
+    ('Perl', '5.20.3'),
+    ('DB', '4.8.30'),
+]
+
+sanity_check_paths = {
+    'files': ['lib/perl5/site_perl/%(perlver)s/x86_64-linux-thread-multi/DB_File.pm'],
+    'dirs': [],
+}
+
+moduleclass = 'data'
diff --git a/easybuild/easyconfigs/d/DISCOVARdenovo/DISCOVARdenovo-52488-foss-2015a.eb b/easybuild/easyconfigs/d/DISCOVARdenovo/DISCOVARdenovo-52488-foss-2015a.eb
index 5f9ea822ee521a3cd7f95683950fdf08a2d934af..1fc6b8de7815748cecc26dbea4f915fd7397ecfd 100644
--- a/easybuild/easyconfigs/d/DISCOVARdenovo/DISCOVARdenovo-52488-foss-2015a.eb
+++ b/easybuild/easyconfigs/d/DISCOVARdenovo/DISCOVARdenovo-52488-foss-2015a.eb
@@ -19,7 +19,7 @@ dependencies = [
 
 sanity_check_paths = {
     'files': ["bin/AffineAlign"],
-    'dirs': ["bin","share"],
+    'dirs': ["bin", "share"],
 }
 
 moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/d/DOLFIN/DOLFIN-1.0.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb b/easybuild/easyconfigs/d/DOLFIN/DOLFIN-1.0.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb
index 64119b5667b010c22d7a01d0c1ba590821d58cc4..4de16cc800d9c6bb277623c41eb3be9f3a4e9740 100644
--- a/easybuild/easyconfigs/d/DOLFIN/DOLFIN-1.0.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/d/DOLFIN/DOLFIN-1.0.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb
@@ -18,9 +18,9 @@ sources = [SOURCELOWER_TAR_GZ]
 source_urls = ['https://launchpad.net/%s/%s.x/%s/+download' % (name.lower(), majver, version)]
 
 patches = [
-           'wl_pkg_linkflags.patch',
-           'petsc-slepc-libs.patch'
-          ]
+    'wl_pkg_linkflags.patch',
+    'petsc-slepc-libs.patch'
+]
 
 builddependencies = [('CMake', '2.8.4')]
 
@@ -29,27 +29,27 @@ python_version = '2.7.3'
 versionsuffix = '-%s-%s' % (python, python_version)
 
 dependencies = [
-                (python, python_version),
-                ('Boost', '1.49.0', versionsuffix),
-                ('UFC', '2.0.5', versionsuffix),
-                ('SWIG', '2.0.4', versionsuffix),
-                ('FFC', '1.0.0', versionsuffix),
-                ('FIAT', '1.0.0', versionsuffix),
-                ('Instant', '1.0.0', versionsuffix),
-                ('Viper', '1.0.0', versionsuffix),
-                ('UFL', '1.0.0', versionsuffix),
-                ('SCOTCH', '5.1.12b_esmumps'),
-                ('Armadillo', '2.4.4', versionsuffix),
-                ('ParMETIS', '4.0.2'),
-                ('SuiteSparse', '3.7.0', '-withparmetis'),
-                ('CGAL', '4.0', versionsuffix),
-                ('PETSc', '3.3-p2', versionsuffix),
-                ('SLEPc', '3.3-p1', versionsuffix),
-                ('MTL4', '4.0.8878', '', True),
-                ('Trilinos', '10.12.2', versionsuffix),
-                ('Sphinx', '1.1.3', versionsuffix),
-                ('zlib', '1.2.7'),
-                ('libxml2', '2.8.0')
-              ]
+    (python, python_version),
+    ('Boost', '1.49.0', versionsuffix),
+    ('UFC', '2.0.5', versionsuffix),
+    ('SWIG', '2.0.4', versionsuffix),
+    ('FFC', '1.0.0', versionsuffix),
+    ('FIAT', '1.0.0', versionsuffix),
+    ('Instant', '1.0.0', versionsuffix),
+    ('Viper', '1.0.0', versionsuffix),
+    ('UFL', '1.0.0', versionsuffix),
+    ('SCOTCH', '5.1.12b_esmumps'),
+    ('Armadillo', '2.4.4', versionsuffix),
+    ('ParMETIS', '4.0.2'),
+    ('SuiteSparse', '3.7.0', '-withparmetis'),
+    ('CGAL', '4.0', versionsuffix),
+    ('PETSc', '3.3-p2', versionsuffix),
+    ('SLEPc', '3.3-p1', versionsuffix),
+    ('MTL4', '4.0.8878', '', True),
+    ('Trilinos', '10.12.2', versionsuffix),
+    ('Sphinx', '1.1.3', versionsuffix),
+    ('zlib', '1.2.7'),
+    ('libxml2', '2.8.0')
+]
 
 moduleclass = 'math'
diff --git a/easybuild/easyconfigs/d/DOLFIN/DOLFIN-1.0.0-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/d/DOLFIN/DOLFIN-1.0.0-goolf-1.4.10-Python-2.7.3.eb
index dcf7a43c080e94e7791d7f69571a4b9ea4f278bd..77e43460d5c5faa51d65bb3f4caed78ecfa6125b 100644
--- a/easybuild/easyconfigs/d/DOLFIN/DOLFIN-1.0.0-goolf-1.4.10-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/d/DOLFIN/DOLFIN-1.0.0-goolf-1.4.10-Python-2.7.3.eb
@@ -18,10 +18,10 @@ sources = [SOURCELOWER_TAR_GZ]
 source_urls = ['https://launchpad.net/%s/%s.x/%s/+download' % (name.lower(), majver, version)]
 
 patches = [
-           'wl_pkg_linkflags.patch',
-           'petsc-slepc-libs.patch',
-           'DOLFIN-1.0.0_GCC-4.7.patch',
-          ]
+    'wl_pkg_linkflags.patch',
+    'petsc-slepc-libs.patch',
+    'DOLFIN-1.0.0_GCC-4.7.patch',
+]
 
 builddependencies = [('CMake', '2.8.4')]
 
@@ -30,27 +30,27 @@ python_version = '2.7.3'
 versionsuffix = '-%s-%s' % (python, python_version)
 
 dependencies = [
-                (python, python_version),
-                ('Boost', '1.49.0', versionsuffix),
-                ('UFC', '2.0.5', versionsuffix),
-                ('SWIG', '2.0.4', versionsuffix),
-                ('FFC', '1.0.0', versionsuffix),
-                ('FIAT', '1.0.0', versionsuffix),
-                ('Instant', '1.0.0', versionsuffix),
-                ('Viper', '1.0.0', versionsuffix),
-                ('UFL', '1.0.0', versionsuffix),
-                ('SCOTCH', '5.1.12b_esmumps'),
-                ('Armadillo', '2.4.4', versionsuffix),
-                ('ParMETIS', '4.0.2'),
-                ('SuiteSparse', '3.7.0', '-withparmetis'),
-                ('CGAL', '4.0', versionsuffix),
-                ('PETSc', '3.3-p2', versionsuffix),
-                ('SLEPc', '3.3-p1', versionsuffix),
-                ('MTL4', '4.0.8878', '', True),
-                ('Trilinos', '10.12.2', versionsuffix),
-                ('Sphinx', '1.1.3', versionsuffix),
-                ('zlib', '1.2.7'),
-                ('libxml2', '2.8.0')
-              ]
+    (python, python_version),
+    ('Boost', '1.49.0', versionsuffix),
+    ('UFC', '2.0.5', versionsuffix),
+    ('SWIG', '2.0.4', versionsuffix),
+    ('FFC', '1.0.0', versionsuffix),
+    ('FIAT', '1.0.0', versionsuffix),
+    ('Instant', '1.0.0', versionsuffix),
+    ('Viper', '1.0.0', versionsuffix),
+    ('UFL', '1.0.0', versionsuffix),
+    ('SCOTCH', '5.1.12b_esmumps'),
+    ('Armadillo', '2.4.4', versionsuffix),
+    ('ParMETIS', '4.0.2'),
+    ('SuiteSparse', '3.7.0', '-withparmetis'),
+    ('CGAL', '4.0', versionsuffix),
+    ('PETSc', '3.3-p2', versionsuffix),
+    ('SLEPc', '3.3-p1', versionsuffix),
+    ('MTL4', '4.0.8878', '', True),
+    ('Trilinos', '10.12.2', versionsuffix),
+    ('Sphinx', '1.1.3', versionsuffix),
+    ('zlib', '1.2.7'),
+    ('libxml2', '2.8.0')
+]
 
 moduleclass = 'math'
diff --git a/easybuild/easyconfigs/d/DOLFIN/DOLFIN-1.0.0-ictce-4.0.6-Python-2.7.3.eb b/easybuild/easyconfigs/d/DOLFIN/DOLFIN-1.0.0-ictce-4.0.6-Python-2.7.3.eb
index 7391205922158dffee07b56bda557cd3665f7c12..ac6c64cf00c423478e59d4dcbb46864dd7911d9f 100644
--- a/easybuild/easyconfigs/d/DOLFIN/DOLFIN-1.0.0-ictce-4.0.6-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/d/DOLFIN/DOLFIN-1.0.0-ictce-4.0.6-Python-2.7.3.eb
@@ -18,9 +18,9 @@ sources = [SOURCELOWER_TAR_GZ]
 source_urls = ['https://launchpad.net/%s/%s.x/%s/+download' % (name.lower(), majver, version)]
 
 patches = [
-           'wl_pkg_linkflags.patch',
-           'petsc-slepc-libs.patch'
-          ]
+    'wl_pkg_linkflags.patch',
+    'petsc-slepc-libs.patch'
+]
 
 builddependencies = [('CMake', '2.8.4')]
 
@@ -29,27 +29,27 @@ python_version = '2.7.3'
 versionsuffix = '-%s-%s' % (python, python_version)
 
 dependencies = [
-                (python, python_version),
-                ('Boost', '1.49.0', versionsuffix),
-                ('UFC', '2.0.5', versionsuffix),
-                ('SWIG', '2.0.4', versionsuffix),
-                ('FFC', '1.0.0', versionsuffix),
-                ('FIAT', '1.0.0', versionsuffix),
-                ('Instant', '1.0.0', versionsuffix),
-                ('Viper', '1.0.0', versionsuffix),
-                ('UFL', '1.0.0', versionsuffix),
-                ('SCOTCH', '5.1.12b_esmumps'),
-                ('Armadillo', '2.4.4', versionsuffix),
-                ('ParMETIS', '4.0.2'),
-                ('SuiteSparse', '3.7.0', '-withparmetis'),
-                ('CGAL', '4.0', versionsuffix),
-                ('PETSc', '3.3-p2', versionsuffix),
-                ('SLEPc', '3.3-p1', versionsuffix),
-                ('MTL4', '4.0.8878', '', True),
-                ('Trilinos', '10.12.2', versionsuffix),
-                ('Sphinx', '1.1.3', versionsuffix),
-                ('zlib', '1.2.7'),
-                ('libxml2', '2.8.0')
-               ]
+    (python, python_version),
+    ('Boost', '1.49.0', versionsuffix),
+    ('UFC', '2.0.5', versionsuffix),
+    ('SWIG', '2.0.4', versionsuffix),
+    ('FFC', '1.0.0', versionsuffix),
+    ('FIAT', '1.0.0', versionsuffix),
+    ('Instant', '1.0.0', versionsuffix),
+    ('Viper', '1.0.0', versionsuffix),
+    ('UFL', '1.0.0', versionsuffix),
+    ('SCOTCH', '5.1.12b_esmumps'),
+    ('Armadillo', '2.4.4', versionsuffix),
+    ('ParMETIS', '4.0.2'),
+    ('SuiteSparse', '3.7.0', '-withparmetis'),
+    ('CGAL', '4.0', versionsuffix),
+    ('PETSc', '3.3-p2', versionsuffix),
+    ('SLEPc', '3.3-p1', versionsuffix),
+    ('MTL4', '4.0.8878', '', True),
+    ('Trilinos', '10.12.2', versionsuffix),
+    ('Sphinx', '1.1.3', versionsuffix),
+    ('zlib', '1.2.7'),
+    ('libxml2', '2.8.0')
+]
 
 moduleclass = 'math'
diff --git a/easybuild/easyconfigs/d/DendroPy/DendroPy-3.12.0-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/d/DendroPy/DendroPy-3.12.0-goolf-1.4.10-Python-2.7.3.eb
index 2734b69ecf14a796ce307f7e71c28e2dbc4109a0..7d7b15088e5cb84bfe4f68f38ca30def4bb5195b 100644
--- a/easybuild/easyconfigs/d/DendroPy/DendroPy-3.12.0-goolf-1.4.10-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/d/DendroPy/DendroPy-3.12.0-goolf-1.4.10-Python-2.7.3.eb
@@ -1,5 +1,5 @@
 ##
-#This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
 #
 # Copyright:: Copyright 2013-2014 The Cyprus Institute
 # Authors::   Thekla Loizou <t.loizou@cyi.ac.cy>
@@ -31,8 +31,8 @@ versionsuffix = "-%s-%s" % (python, pythonversion)
 dependencies = [(python, pythonversion)]
 
 sanity_check_paths = {
-    'files': ['bin/cattrees.py','bin/long_branch_symmdiff.py','bin/sumlabels.py',
-              'bin/sumtrees.py','bin/strict_consensus_merge.py'],
+    'files': ['bin/cattrees.py', 'bin/long_branch_symmdiff.py', 'bin/sumlabels.py',
+              'bin/sumtrees.py', 'bin/strict_consensus_merge.py'],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/d/Docutils/Docutils-0.9.1-goalf-1.1.0-no-OFED-Python-2.7.3.eb b/easybuild/easyconfigs/d/Docutils/Docutils-0.9.1-goalf-1.1.0-no-OFED-Python-2.7.3.eb
index 67c0828444d65f25dfaa7f8ba1e0ea01a48dc306..05f82d3b1dfc6adad2315159bb3bce0cd5d74906 100644
--- a/easybuild/easyconfigs/d/Docutils/Docutils-0.9.1-goalf-1.1.0-no-OFED-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/d/Docutils/Docutils-0.9.1-goalf-1.1.0-no-OFED-Python-2.7.3.eb
@@ -24,8 +24,8 @@ dependencies = [(python, pythonversion)]
 pylibdir = "lib/python%s/site-packages/%s" % (".".join(pythonversion.split(".")[0:2]), name.lower())
 
 sanity_check_paths = {
-                      'files': [],
-                      'dirs': ["bin", pylibdir]
-                     }
+    'files': [],
+    'dirs': ["bin", pylibdir]
+}
 
 moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/d/Docutils/Docutils-0.9.1-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/d/Docutils/Docutils-0.9.1-goolf-1.4.10-Python-2.7.3.eb
index 53a00b7cbb3ed99cb80e269bea524d6b65cd8b18..b16e3ee2f072771a7d5add996fe556bcedc90449 100644
--- a/easybuild/easyconfigs/d/Docutils/Docutils-0.9.1-goolf-1.4.10-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/d/Docutils/Docutils-0.9.1-goolf-1.4.10-Python-2.7.3.eb
@@ -24,8 +24,8 @@ dependencies = [(python, pythonversion)]
 pylibdir = "lib/python%s/site-packages/%s" % (".".join(pythonversion.split(".")[0:2]), name.lower())
 
 sanity_check_paths = {
-                      'files': [],
-                      'dirs': ["bin", pylibdir]
-                     }
+    'files': [],
+    'dirs': ["bin", pylibdir]
+}
 
 moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/d/Docutils/Docutils-0.9.1-ictce-4.0.6-Python-2.7.3.eb b/easybuild/easyconfigs/d/Docutils/Docutils-0.9.1-ictce-4.0.6-Python-2.7.3.eb
index bcb77c28180032581ead348ac35703719a22d0dd..e54119ec9b9a112ae3b776387df9d549d444b159 100644
--- a/easybuild/easyconfigs/d/Docutils/Docutils-0.9.1-ictce-4.0.6-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/d/Docutils/Docutils-0.9.1-ictce-4.0.6-Python-2.7.3.eb
@@ -24,8 +24,8 @@ dependencies = [(python, pythonversion)]
 pylibdir = "lib/python%s/site-packages/%s" % (".".join(pythonversion.split(".")[0:2]), name.lower())
 
 sanity_check_paths = {
-                      'files': [],
-                      'dirs': ["bin", pylibdir]
-                     }
+    'files': [],
+    'dirs': ["bin", pylibdir]
+}
 
 moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/d/Docutils/Docutils-0.9.1-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/d/Docutils/Docutils-0.9.1-ictce-5.3.0-Python-2.7.3.eb
index 63105571a87be5bc313d48681e97ce3d8a4d62f9..9fcadcde270a75eda0d232e55a99c489e1de646c 100644
--- a/easybuild/easyconfigs/d/Docutils/Docutils-0.9.1-ictce-5.3.0-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/d/Docutils/Docutils-0.9.1-ictce-5.3.0-Python-2.7.3.eb
@@ -25,8 +25,8 @@ dependencies = [(python, pythonversion)]
 pylibdir = "lib/python%s/site-packages/%s" % (".".join(pythonversion.split(".")[0:2]), name.lower())
 
 sanity_check_paths = {
-                      'files': [],
-                      'dirs': ["bin", pylibdir]
-                     }
+    'files': [],
+    'dirs': ["bin", pylibdir]
+}
 
 moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.1.1-ictce-5.4.0.eb b/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.1.1-ictce-5.4.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..bb6520334158a07cb05dca850c82af504defd25f
--- /dev/null
+++ b/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.1.1-ictce-5.4.0.eb
@@ -0,0 +1,18 @@
+name = 'Doxygen'
+version = '1.8.1.1'
+
+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': 'ictce', 'version': '5.4.0'}
+
+sources = ['%(namelower)s-%(version)s.src.tar.gz']
+source_urls = ['http://ftp.stack.nl/pub/users/dimitri/']
+
+builddependencies = [
+    ('flex', '2.5.35'),
+    ('Bison', '2.5'),
+]
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.10-foss-2015b.eb b/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.10-foss-2015b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..2185cbf1af6dd3cd18f4ca3d677e99188ebaf7cf
--- /dev/null
+++ b/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.10-foss-2015b.eb
@@ -0,0 +1,19 @@
+name = 'Doxygen'
+version = '1.8.10'
+
+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': 'foss', 'version': '2015b'}
+
+sources = ['%(namelower)s-%(version)s.src.tar.gz']
+source_urls = ['http://ftp.stack.nl/pub/users/dimitri/']
+
+builddependencies = [
+    ('CMake', '3.4.1'),
+    ('flex', '2.5.39'),
+    ('Bison', '3.0.4'),
+]
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.11-GCC-4.9.2.eb b/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.11-GCC-4.9.2.eb
new file mode 100644
index 0000000000000000000000000000000000000000..5adccf48d70476aee19c14ae1596e1fb79b5676d
--- /dev/null
+++ b/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.11-GCC-4.9.2.eb
@@ -0,0 +1,19 @@
+name = 'Doxygen'
+version = '1.8.11'
+
+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': 'GCC', 'version': '4.9.2'}
+
+sources = ['%(namelower)s-%(version)s.src.tar.gz']
+source_urls = ['http://ftp.stack.nl/pub/users/dimitri/']
+
+builddependencies = [
+    ('CMake', '3.4.1'),
+    ('flex', '2.6.0'),
+    ('Bison', '3.0.4'),
+]
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.11-foss-2015a.eb b/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.11-foss-2015a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..1db648e43da586836ab0c3363835af1f96228f92
--- /dev/null
+++ b/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.11-foss-2015a.eb
@@ -0,0 +1,19 @@
+name = 'Doxygen'
+version = '1.8.11'
+
+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': 'foss', 'version': '2015a'}
+
+sources = ['%(namelower)s-%(version)s.src.tar.gz']
+source_urls = ['http://ftp.stack.nl/pub/users/dimitri/']
+
+builddependencies = [
+    ('CMake', '3.4.1'),
+    ('flex', '2.6.0'),
+    ('Bison', '3.0.4'),
+]
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/e/ECore/ECore-1.5.2-ictce-5.5.0-clusterapps.eb b/easybuild/easyconfigs/e/ECore/ECore-1.5.2-ictce-5.5.0-clusterapps.eb
index ca072da66b97cf40efb62307a4a5ff7187e826b3..56e86c8e44d79093978ee26324bf5924c06b28ee 100644
--- a/easybuild/easyconfigs/e/ECore/ECore-1.5.2-ictce-5.5.0-clusterapps.eb
+++ b/easybuild/easyconfigs/e/ECore/ECore-1.5.2-ictce-5.5.0-clusterapps.eb
@@ -18,9 +18,9 @@ patches = ['ecore-license-var.patch']
 dependencies = [('OpenMPI', '1.4.5')]
 
 sanity_check_paths = {
-    'files': ['arch/linux-rh5-x86_64/bin/%s' % x for x in  ['absperm', 'FormationFactor', 'nmr',
-                                                            'orterun', 'packer', 'randomwalkffmpi',
-                                                            'unpacker']] + \
+    'files': ['arch/linux-rh5-x86_64/bin/%s' % x for x in ['absperm', 'FormationFactor', 'nmr',
+                                                           'orterun', 'packer', 'randomwalkffmpi',
+                                                           'unpacker']] +
              ['absperm.sh',  'formationfactor.sh', 'nmr.sh', 'rw_formationfactor.sh'],
     'dirs': [],
 }
diff --git a/easybuild/easyconfigs/e/ECore/ECore-1.5.2-ictce-5.5.0.eb b/easybuild/easyconfigs/e/ECore/ECore-1.5.2-ictce-5.5.0.eb
index 7c028041b8bfab81c7c099d20a5f69dee694a615..d93540e9b8d1175d73b994a743d6f4c34688de24 100644
--- a/easybuild/easyconfigs/e/ECore/ECore-1.5.2-ictce-5.5.0.eb
+++ b/easybuild/easyconfigs/e/ECore/ECore-1.5.2-ictce-5.5.0.eb
@@ -16,7 +16,7 @@ patches = ['ecore-license-var.patch']
 dependencies = [('OpenMPI', '1.4.5')]
 
 sanity_check_paths = {
-    'files': ["ecore.sh", 'noarch/launch.sh'] + \
+    'files': ["ecore.sh", 'noarch/launch.sh'] +
              ['arch/linux-rh5-x86_64/bin/%s' % x for x in ['diagenesismodeller', 'ecore', 'packer',
                                                            'PorenetworkExtraction', 'Poresim', 'unpacker']],
     'dirs': [],
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 5403f1fde92af6ddf0b74aeb7e526781d2fc3142..8ac9aea768a9d798d1eeccb4c6fe04cfa8ecefe7 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
@@ -3,7 +3,7 @@
 # Swiss Institute of Bioinformatics
 # Biozentrum - University of Basel
 
-easyblock='MakeCp'
+easyblock = 'MakeCp'
 
 name = 'ELPH'
 version = '1.0.1'
@@ -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 8986e9720049c69dfe4e19f7db73e1c79ca920e3..ba2c506ee5e9a285361752a4df4dc6d3c0f285e0 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
@@ -3,7 +3,7 @@
 # Swiss Institute of Bioinformatics
 # Biozentrum - University of Basel
 
-easyblock='MakeCp'
+easyblock = 'MakeCp'
 
 name = 'ELPH'
 version = '1.0.1'
@@ -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/ELinks/ELinks-0.12pre5-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/e/ELinks/ELinks-0.12pre5-goalf-1.1.0-no-OFED.eb
index 740d133cb44dc3821265259e4343b4d817a259df..6e775a095b524731a063a8ccc9a2ccae19348940 100644
--- a/easybuild/easyconfigs/e/ELinks/ELinks-0.12pre5-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/e/ELinks/ELinks-0.12pre5-goalf-1.1.0-no-OFED.eb
@@ -21,8 +21,8 @@ source_urls = ['http://elinks.or.cz/download/']
 toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
 
 sanity_check_paths = {
-                      'files': ['bin/elinks'],
-                      'dirs': []
-                     }
+    'files': ['bin/elinks'],
+    'dirs': []
+}
 
 moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/e/ELinks/ELinks-0.12pre5-goolf-1.4.10.eb b/easybuild/easyconfigs/e/ELinks/ELinks-0.12pre5-goolf-1.4.10.eb
index 098e55a84ecc6aaa913933ae178604aa087da011..ee65cc074ef8d477dc0b9ec1f50e05211f03e55c 100644
--- a/easybuild/easyconfigs/e/ELinks/ELinks-0.12pre5-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/e/ELinks/ELinks-0.12pre5-goolf-1.4.10.eb
@@ -21,8 +21,8 @@ source_urls = ['http://elinks.or.cz/download/']
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 
 sanity_check_paths = {
-                      'files': ['bin/elinks'],
-                      'dirs': []
-                     }
+    'files': ['bin/elinks'],
+    'dirs': []
+}
 
 moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/e/ELinks/ELinks-0.12pre5-ictce-4.0.6.eb b/easybuild/easyconfigs/e/ELinks/ELinks-0.12pre5-ictce-4.0.6.eb
index 3298a3a17d051c0d2620272f12691f3bafeb5f08..413650f9a5791b1b4312fce68976ff3048c9b3ff 100644
--- a/easybuild/easyconfigs/e/ELinks/ELinks-0.12pre5-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/e/ELinks/ELinks-0.12pre5-ictce-4.0.6.eb
@@ -21,8 +21,8 @@ source_urls = ['http://elinks.or.cz/download/']
 toolchain = {'version': '4.0.6', 'name': 'ictce'}
 
 sanity_check_paths = {
-                      'files': ['bin/elinks'],
-                      'dirs': []
-                     }
+    'files': ['bin/elinks'],
+    'dirs': []
+}
 
 moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/e/ELinks/ELinks-0.12pre5-ictce-5.3.0.eb b/easybuild/easyconfigs/e/ELinks/ELinks-0.12pre5-ictce-5.3.0.eb
index 1dbae1bd2fb07c91feed4eab89f138242dda142d..176ffcb6bd9b366bcddee23283310613c518663a 100644
--- a/easybuild/easyconfigs/e/ELinks/ELinks-0.12pre5-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/e/ELinks/ELinks-0.12pre5-ictce-5.3.0.eb
@@ -22,8 +22,8 @@ source_urls = ['http://elinks.or.cz/download/']
 toolchain = {'name': 'ictce', 'version': '5.3.0'}
 
 sanity_check_paths = {
-                      'files': ['bin/elinks'],
-                      'dirs': []
-                     }
+    'files': ['bin/elinks'],
+    'dirs': []
+}
 
 moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/e/ESPResSo/ESPResSo-3.1.1-goalf-1.1.0-no-OFED-parallel.eb b/easybuild/easyconfigs/e/ESPResSo/ESPResSo-3.1.1-goalf-1.1.0-no-OFED-parallel.eb
index dac20cc956ac2a5def6d4c864fffb7620d68c0a8..5ef397df32b73dc60df22828aca5eba887ff4a7f 100644
--- a/easybuild/easyconfigs/e/ESPResSo/ESPResSo-3.1.1-goalf-1.1.0-no-OFED-parallel.eb
+++ b/easybuild/easyconfigs/e/ESPResSo/ESPResSo-3.1.1-goalf-1.1.0-no-OFED-parallel.eb
@@ -10,8 +10,8 @@
 # http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-80.html
 ##
 
-name          = 'ESPResSo'
-version       = '3.1.1'
+name = 'ESPResSo'
+version = '3.1.1'
 versionsuffix = '-parallel'
 
 homepage = 'http://espressomd.org/'
@@ -20,15 +20,15 @@ description = """ESPResSo is a highly versatile software package for performing
                  of coarse-grained atomistic or bead-spring models as they are used in
                  soft-matter research in physics, chemistry and molecular biology."""
 
-toolchain     = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
+toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
 toolchainopts = {'optarch': True, 'pic': True, 'usempi': True}
-configopts    =  '--with-mpi'
+configopts = '--with-mpi'
 
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = [('http://download.savannah.gnu.org/releases/espressomd/')]
 
 dependencies = [
-                ('Tcl', '8.5.12'),
-               ]
+    ('Tcl', '8.5.12'),
+]
 
 moduleclass = 'phys'
diff --git a/easybuild/easyconfigs/e/ESPResSo/ESPResSo-3.1.1-goalf-1.1.0-no-OFED-serial.eb b/easybuild/easyconfigs/e/ESPResSo/ESPResSo-3.1.1-goalf-1.1.0-no-OFED-serial.eb
index fbac4052147ed3f9d7722304830f6a86302e8d0d..dc0eba6edb4fd2c4f9745164aa5b985516929959 100644
--- a/easybuild/easyconfigs/e/ESPResSo/ESPResSo-3.1.1-goalf-1.1.0-no-OFED-serial.eb
+++ b/easybuild/easyconfigs/e/ESPResSo/ESPResSo-3.1.1-goalf-1.1.0-no-OFED-serial.eb
@@ -10,8 +10,8 @@
 # http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-80.html
 ##
 
-name          = 'ESPResSo'
-version       = '3.1.1'
+name = 'ESPResSo'
+version = '3.1.1'
 versionsuffix = '-serial'
 
 homepage = 'http://espressomd.org/'
@@ -20,15 +20,15 @@ description = """ESPResSo is a highly versatile software package for performing
                  of coarse-grained atomistic or bead-spring models as they are used in
                  soft-matter research in physics, chemistry and molecular biology."""
 
-toolchain     = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
+toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
 toolchainopts = {'optarch': True, 'pic': True}
-configopts    = ''  # Modify this line to add or change espresso config options
+configopts = ''  # Modify this line to add or change espresso config options
 
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = [('http://download.savannah.gnu.org/releases/espressomd/')]
 
 dependencies = [
-                ('Tcl', '8.5.12'),
-               ]
+    ('Tcl', '8.5.12'),
+]
 
 moduleclass = 'phys'
diff --git a/easybuild/easyconfigs/e/ESPResSo/ESPResSo-3.1.1-goolf-1.4.10-parallel.eb b/easybuild/easyconfigs/e/ESPResSo/ESPResSo-3.1.1-goolf-1.4.10-parallel.eb
index 39f5667ba5c2a4dd05d5dfedaf66f89e1b0197ee..209b0e8d818c0dbd4bc1666231958ef50b8b4461 100644
--- a/easybuild/easyconfigs/e/ESPResSo/ESPResSo-3.1.1-goolf-1.4.10-parallel.eb
+++ b/easybuild/easyconfigs/e/ESPResSo/ESPResSo-3.1.1-goolf-1.4.10-parallel.eb
@@ -10,8 +10,8 @@
 # http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-80.html
 ##
 
-name          = 'ESPResSo'
-version       = '3.1.1'
+name = 'ESPResSo'
+version = '3.1.1'
 versionsuffix = '-parallel'
 
 homepage = 'http://espressomd.org/'
@@ -22,13 +22,13 @@ description = """ESPResSo is a highly versatile software package for performing
 
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 toolchainopts = {'optarch': True, 'pic': True, 'usempi': True}
-configopts    =  '--with-mpi'
+configopts = '--with-mpi'
 
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = [('http://download.savannah.gnu.org/releases/espressomd/')]
 
 dependencies = [
-                ('Tcl', '8.5.12'),
-               ]
+    ('Tcl', '8.5.12'),
+]
 
 moduleclass = 'phys'
diff --git a/easybuild/easyconfigs/e/ESPResSo/ESPResSo-3.1.1-goolf-1.4.10-serial.eb b/easybuild/easyconfigs/e/ESPResSo/ESPResSo-3.1.1-goolf-1.4.10-serial.eb
index 79d7c269620ff525a7e05b98545ab8baa6970402..80ab0978a15839098c444bb74947496b7259a242 100644
--- a/easybuild/easyconfigs/e/ESPResSo/ESPResSo-3.1.1-goolf-1.4.10-serial.eb
+++ b/easybuild/easyconfigs/e/ESPResSo/ESPResSo-3.1.1-goolf-1.4.10-serial.eb
@@ -10,8 +10,8 @@
 # http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-80.html
 ##
 
-name          = 'ESPResSo'
-version       = '3.1.1'
+name = 'ESPResSo'
+version = '3.1.1'
 versionsuffix = '-serial'
 
 homepage = 'http://espressomd.org/'
@@ -22,13 +22,13 @@ description = """ESPResSo is a highly versatile software package for performing
 
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 toolchainopts = {'optarch': True, 'pic': True}
-configopts    = ''  # Modify this line to add or change espresso config options
+configopts = ''  # Modify this line to add or change espresso config options
 
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = [('http://download.savannah.gnu.org/releases/espressomd/')]
 
 dependencies = [
-                ('Tcl', '8.5.12'),
-               ]
+    ('Tcl', '8.5.12'),
+]
 
 moduleclass = 'phys'
diff --git a/easybuild/easyconfigs/e/ESPResSo/ESPResSo-3.1.1-ictce-4.0.6-parallel.eb b/easybuild/easyconfigs/e/ESPResSo/ESPResSo-3.1.1-ictce-4.0.6-parallel.eb
index 0d5009ded455c4503119afce6f6110236c5e4b27..5b960cc12d0d5416739c7ecab4a9bfc9ff0c2d7e 100644
--- a/easybuild/easyconfigs/e/ESPResSo/ESPResSo-3.1.1-ictce-4.0.6-parallel.eb
+++ b/easybuild/easyconfigs/e/ESPResSo/ESPResSo-3.1.1-ictce-4.0.6-parallel.eb
@@ -10,8 +10,8 @@
 # http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-80.html
 ##
 
-name          = 'ESPResSo'
-version       = '3.1.1'
+name = 'ESPResSo'
+version = '3.1.1'
 versionsuffix = '-parallel'
 
 homepage = 'http://espressomd.org/'
@@ -20,15 +20,15 @@ description = """ESPResSo is a highly versatile software package for performing
                  of coarse-grained atomistic or bead-spring models as they are used in
                  soft-matter research in physics, chemistry and molecular biology."""
 
-toolchain     = {'name': 'ictce', 'version': '4.0.6'}
+toolchain = {'name': 'ictce', 'version': '4.0.6'}
 toolchainopts = {'optarch': True, 'pic': True, 'usempi': True}
-configopts    =  '--with-mpi'
+configopts = '--with-mpi'
 
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = [('http://download.savannah.gnu.org/releases/espressomd/')]
 
 dependencies = [
-                ('Tcl', '8.5.12'),
-               ]
+    ('Tcl', '8.5.12'),
+]
 
 moduleclass = 'phys'
diff --git a/easybuild/easyconfigs/e/ESPResSo/ESPResSo-3.1.1-ictce-4.0.6-serial.eb b/easybuild/easyconfigs/e/ESPResSo/ESPResSo-3.1.1-ictce-4.0.6-serial.eb
index 638f30315a53c9f49db52db08892ac51e86b9357..21dd493eb1e4dbc95515625e0f740f55d9ea89ff 100644
--- a/easybuild/easyconfigs/e/ESPResSo/ESPResSo-3.1.1-ictce-4.0.6-serial.eb
+++ b/easybuild/easyconfigs/e/ESPResSo/ESPResSo-3.1.1-ictce-4.0.6-serial.eb
@@ -10,8 +10,8 @@
 # http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-80.html
 ##
 
-name          = 'ESPResSo'
-version       = '3.1.1'
+name = 'ESPResSo'
+version = '3.1.1'
 versionsuffix = '-serial'
 
 homepage = 'http://espressomd.org/'
@@ -20,15 +20,15 @@ description = """ESPResSo is a highly versatile software package for performing
                  of coarse-grained atomistic or bead-spring models as they are used in
                  soft-matter research in physics, chemistry and molecular biology."""
 
-toolchain     = {'name': 'ictce', 'version': '4.0.6'}
+toolchain = {'name': 'ictce', 'version': '4.0.6'}
 toolchainopts = {'optarch': True, 'pic': True, 'usempi': True}
-configopts    =  '--with-mpi'
+configopts = '--with-mpi'
 
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = [('http://download.savannah.gnu.org/releases/espressomd/')]
 
 dependencies = [
-                ('Tcl', '8.5.12'),
-               ]
+    ('Tcl', '8.5.12'),
+]
 
 moduleclass = 'phys'
diff --git a/easybuild/easyconfigs/e/ESPResSo/ESPResSo-3.1.1-ictce-5.3.0-parallel.eb b/easybuild/easyconfigs/e/ESPResSo/ESPResSo-3.1.1-ictce-5.3.0-parallel.eb
index 890278722c6024bf7fa69c42c78f6a73355b32ab..9ad3efca4c6877e5e16fce297c064ea26e70b403 100644
--- a/easybuild/easyconfigs/e/ESPResSo/ESPResSo-3.1.1-ictce-5.3.0-parallel.eb
+++ b/easybuild/easyconfigs/e/ESPResSo/ESPResSo-3.1.1-ictce-5.3.0-parallel.eb
@@ -10,8 +10,8 @@
 # http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-80.html
 ##
 
-name          = 'ESPResSo'
-version       = '3.1.1'
+name = 'ESPResSo'
+version = '3.1.1'
 versionsuffix = '-parallel'
 
 homepage = 'http://espressomd.org/'
@@ -23,13 +23,13 @@ description = """ESPResSo is a highly versatile software package for performing
 
 toolchain = {'name': 'ictce', 'version': '5.3.0'}
 toolchainopts = {'optarch': True, 'pic': True, 'usempi': True}
-configopts    =  '--with-mpi'
+configopts = '--with-mpi'
 
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = [('http://download.savannah.gnu.org/releases/espressomd/')]
 
 dependencies = [
-                ('Tcl', '8.5.12'),
-               ]
+    ('Tcl', '8.5.12'),
+]
 
 moduleclass = 'phys'
diff --git a/easybuild/easyconfigs/e/ESPResSo/ESPResSo-3.1.1-ictce-5.3.0-serial.eb b/easybuild/easyconfigs/e/ESPResSo/ESPResSo-3.1.1-ictce-5.3.0-serial.eb
index dd73e5835e9df0289a879d4d9fab337e2916cb38..525e2ebf3e22dbde604e44c2fcb7c5127603aaac 100644
--- a/easybuild/easyconfigs/e/ESPResSo/ESPResSo-3.1.1-ictce-5.3.0-serial.eb
+++ b/easybuild/easyconfigs/e/ESPResSo/ESPResSo-3.1.1-ictce-5.3.0-serial.eb
@@ -10,8 +10,8 @@
 # http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-80.html
 ##
 
-name          = 'ESPResSo'
-version       = '3.1.1'
+name = 'ESPResSo'
+version = '3.1.1'
 versionsuffix = '-serial'
 
 homepage = 'http://espressomd.org/'
@@ -23,13 +23,13 @@ description = """ESPResSo is a highly versatile software package for performing
 
 toolchain = {'name': 'ictce', 'version': '5.3.0'}
 toolchainopts = {'optarch': True, 'pic': True, 'usempi': True}
-configopts    =  '--with-mpi'
+configopts = '--with-mpi'
 
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = [('http://download.savannah.gnu.org/releases/espressomd/')]
 
 dependencies = [
-                ('Tcl', '8.5.12'),
-               ]
+    ('Tcl', '8.5.12'),
+]
 
 moduleclass = 'phys'
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 9ec46d296fbb4621a01f19cc7ea82f6afebfceb0..17f0b9d1607f00acf7424b9b79d6ac7b69592647 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
@@ -24,7 +24,7 @@ configopts = "--with-netcdf-prefix=$EBROOTNETCDF "
 configopts += "--with-netcdf-libs='-L$EBROOTNETCDF/lib -lnetcdf -lnetcdff' "
 configopts += " --with-netcdf-incs='-I$EBROOTNETCDF/include'"
 
-dependencies = [ ('netCDF', '4.1.3') ]
+dependencies = [('netCDF', '4.1.3')]
 
 sanity_check_paths = {
     'files': ["bin/etsf_io"],
diff --git a/easybuild/easyconfigs/e/Eigen/Eigen-3.2.7-intel-2016a.eb b/easybuild/easyconfigs/e/Eigen/Eigen-3.2.7-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..5e2d4fc5a2ba7d3fbe50fa0dc37dd237a7b3cfd1
--- /dev/null
+++ b/easybuild/easyconfigs/e/Eigen/Eigen-3.2.7-intel-2016a.eb
@@ -0,0 +1,14 @@
+name = 'Eigen'
+version = '3.2.7'
+
+homepage = 'http://eigen.tuxfamily.org/index.php?title=Main_Page'
+description = """Eigen is a C++ template library for linear algebra:
+ matrices, vectors, numerical solvers, and related algorithms."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+toolchainopts = {'optarch': True, 'pic': True}
+
+source_urls = ['http://bitbucket.org/%(namelower)s/%(namelower)s/get']
+sources = ['%(version)s.tar.bz2']
+
+moduleclass = 'math'
diff --git a/easybuild/easyconfigs/e/ErlangOTP/ErlangOTP-R16B02-GCC-4.7.2.eb b/easybuild/easyconfigs/e/ErlangOTP/ErlangOTP-R16B02-GCC-4.7.2.eb
index 9f3aa94ef1c682f9d0155543184bbba1ee044b24..3968d910aa4933899d9e7ec07eb8c9817944324a 100644
--- a/easybuild/easyconfigs/e/ErlangOTP/ErlangOTP-R16B02-GCC-4.7.2.eb
+++ b/easybuild/easyconfigs/e/ErlangOTP/ErlangOTP-R16B02-GCC-4.7.2.eb
@@ -11,7 +11,7 @@ toolchain = {'name': 'GCC', 'version': '4.7.2'}
 sources = ['otp_src_%(version)s.tar.gz']
 source_urls = ['http://www.erlang.org/download']
 
-builddependencies = [('Java','1.7.0_45','',True)]
+builddependencies = [('Java', '1.7.0_45', '', True)]
 
 configopts = '--with-javac '
 
diff --git a/easybuild/easyconfigs/e/eXpress/eXpress-1.5.1-goolf-1.4.10.eb b/easybuild/easyconfigs/e/eXpress/eXpress-1.5.1-goolf-1.4.10.eb
index eb6680d2d69afb75d0f4d3ba41252280cc312eb0..037dcd81856fd8d14e1c872bcb87c2e6cf290ed7 100644
--- a/easybuild/easyconfigs/e/eXpress/eXpress-1.5.1-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/e/eXpress/eXpress-1.5.1-goolf-1.4.10.eb
@@ -25,7 +25,7 @@ builddependencies = [
 ]
 
 dependencies = [
-    ('Boost', '1.51.0'), # Boost-1.53.0 not working?
+    ('Boost', '1.51.0'),  # Boost-1.53.0 not working?
     ('gperftools', '2.1'),
     ('protobuf', '2.5.0')
 ]
diff --git a/easybuild/easyconfigs/e/ed/ed-1.9-goolf-1.4.10.eb b/easybuild/easyconfigs/e/ed/ed-1.9-goolf-1.4.10.eb
index 361605cda983330a587321e36f1860aa3822bf5e..b0dc02f6dd5cb72be74e4a74349e5aaddae51228 100644
--- a/easybuild/easyconfigs/e/ed/ed-1.9-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/e/ed/ed-1.9-goolf-1.4.10.eb
@@ -12,8 +12,8 @@ sources = [SOURCE_TAR_GZ]
 source_urls = [GNU_SOURCE]
 
 sanity_check_paths = {
-    'files' : ['bin/ed'],
-    'dirs' : [],
+    'files': ['bin/ed'],
+    'dirs': [],
 }
 
 moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/e/ed/ed-1.9-ictce-5.3.0.eb b/easybuild/easyconfigs/e/ed/ed-1.9-ictce-5.3.0.eb
index babb529111d7fd3ffef11927abdadfed0f1bedd6..48f5d0b7b4e0539a6752834c448adbf56a133158 100644
--- a/easybuild/easyconfigs/e/ed/ed-1.9-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/e/ed/ed-1.9-ictce-5.3.0.eb
@@ -12,8 +12,8 @@ sources = [SOURCE_TAR_GZ]
 source_urls = ['http://ftpmirror.gnu.org/%(name)s/']
 
 sanity_check_paths = {
-    'files' : ['bin/ed'],
-    'dirs' : [],
+    'files': ['bin/ed'],
+    'dirs': [],
 }
 
 moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/e/eudev/eudev-3.0-intel-2014b.eb b/easybuild/easyconfigs/e/eudev/eudev-3.0-intel-2014b.eb
index a1c5928f0bf84c89e93acc15c41b9a4bad728227..464dcb0125d6e58255e6774c6133f50c77e37052 100644
--- a/easybuild/easyconfigs/e/eudev/eudev-3.0-intel-2014b.eb
+++ b/easybuild/easyconfigs/e/eudev/eudev-3.0-intel-2014b.eb
@@ -26,8 +26,8 @@ configopts = '--disable-blkid --disable-selinux --disable-gudev --disable-manpag
 runtest = 'check'
 
 sanity_check_paths = {
-    'files' : ['bin/udevadm', 'include/libudev.h', 'include/udev.h', 'lib/libudev.so.1'],
-    'dirs' : [],
+    'files': ['bin/udevadm', 'include/libudev.h', 'include/udev.h', 'lib/libudev.so.1'],
+    'dirs': [],
 }
 
 moduleclass = 'system'
diff --git a/easybuild/easyconfigs/e/eudev/eudev-3.0-intel-2015a.eb b/easybuild/easyconfigs/e/eudev/eudev-3.0-intel-2015a.eb
index 5108981bdd56eec3bf4f1e4f0863d1da9041657c..245048609d040f3e4ce8b94eae31fd845d817a10 100644
--- a/easybuild/easyconfigs/e/eudev/eudev-3.0-intel-2015a.eb
+++ b/easybuild/easyconfigs/e/eudev/eudev-3.0-intel-2015a.eb
@@ -26,8 +26,8 @@ configopts = '--disable-blkid --disable-selinux --disable-gudev --disable-manpag
 runtest = 'check'
 
 sanity_check_paths = {
-    'files' : ['bin/udevadm', 'include/libudev.h', 'include/udev.h', 'lib/libudev.so.1'],
-    'dirs' : [],
+    'files': ['bin/udevadm', 'include/libudev.h', 'include/udev.h', 'lib/libudev.so.1'],
+    'dirs': [],
 }
 
 moduleclass = 'system'
diff --git a/easybuild/easyconfigs/e/eudev/eudev-3.1.2-intel-2015b.eb b/easybuild/easyconfigs/e/eudev/eudev-3.1.2-intel-2015b.eb
index b06feacb05c07410939cc1d28a1a7bb96471e2f0..da7d5f4069afe775e9d5263c1eb71ae9daebf6fe 100644
--- a/easybuild/easyconfigs/e/eudev/eudev-3.1.2-intel-2015b.eb
+++ b/easybuild/easyconfigs/e/eudev/eudev-3.1.2-intel-2015b.eb
@@ -26,8 +26,8 @@ configopts = '--disable-blkid --disable-selinux --disable-gudev --disable-manpag
 runtest = 'check'
 
 sanity_check_paths = {
-    'files' : ['bin/udevadm', 'include/libudev.h', 'include/udev.h', 'lib/libudev.so.1'],
-    'dirs' : [],
+    'files': ['bin/udevadm', 'include/libudev.h', 'include/udev.h', 'lib/libudev.so.1'],
+    'dirs': [],
 }
 
 moduleclass = 'system'
diff --git a/easybuild/easyconfigs/e/eudev/eudev-3.1.5-intel-2015b.eb b/easybuild/easyconfigs/e/eudev/eudev-3.1.5-intel-2015b.eb
index cd53df32962ffa73721e24a65049689f79cc846f..b58e614820434dcbbf1c33af0336ee4d0e5c4b33 100644
--- a/easybuild/easyconfigs/e/eudev/eudev-3.1.5-intel-2015b.eb
+++ b/easybuild/easyconfigs/e/eudev/eudev-3.1.5-intel-2015b.eb
@@ -26,8 +26,8 @@ configopts = '--disable-blkid --disable-selinux --disable-gudev --disable-manpag
 runtest = 'check'
 
 sanity_check_paths = {
-    'files' : ['bin/udevadm', 'include/libudev.h', 'include/udev.h', 'lib/libudev.so.1'],
-    'dirs' : [],
+    'files': ['bin/udevadm', 'include/libudev.h', 'include/udev.h', 'lib/libudev.so.1'],
+    'dirs': [],
 }
 
 moduleclass = 'system'
diff --git a/easybuild/easyconfigs/e/eudev/eudev-3.1.5-intel-2016a.eb b/easybuild/easyconfigs/e/eudev/eudev-3.1.5-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..8da9fd6afaf85b866741dd4f0a8b8dcc99fbbea3
--- /dev/null
+++ b/easybuild/easyconfigs/e/eudev/eudev-3.1.5-intel-2016a.eb
@@ -0,0 +1,33 @@
+easyblock = 'ConfigureMake'
+
+name = 'eudev'
+version = '3.1.5'
+
+homepage = 'https://wiki.gentoo.org/wiki/Project:Eudev'
+description = """eudev is a fork of systemd-udev with the goal of obtaining
+ better compatibility with existing software such as
+ OpenRC and Upstart, older kernels, various toolchains
+ and anything else required by users and various distributions."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+toolchainopts = {'cstd': 'c99'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = ['http://dev.gentoo.org/~blueness/%(name)s/']
+patches = ['%(name)s-3.1.2_pre-2.6.34_kernel.patch']
+
+builddependencies = [
+    ('gperf', '3.0.4'),
+]
+
+osdependencies = [('kernel-headers', 'linux-libc-dev')]
+
+configopts = '--disable-blkid --disable-selinux --disable-gudev --disable-manpages '
+runtest = 'check'
+
+sanity_check_paths = {
+    'files': ['bin/udevadm', 'include/libudev.h', 'include/udev.h', 'lib/libudev.so.1'],
+    'dirs': [],
+}
+
+moduleclass = 'system'
diff --git a/easybuild/easyconfigs/e/expat/expat-2.1.0-foss-2015b.eb b/easybuild/easyconfigs/e/expat/expat-2.1.0-foss-2015b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..f7e3a65441f07bc1ba6eb78b8e60bbf6197a68de
--- /dev/null
+++ b/easybuild/easyconfigs/e/expat/expat-2.1.0-foss-2015b.eb
@@ -0,0 +1,16 @@
+easyblock = 'ConfigureMake'
+
+name = 'expat'
+version = '2.1.0'
+
+homepage = 'http://expat.sourceforge.net/'
+description = """Expat is an XML parser library written in C. It is a stream-oriented parser in which an application
+ registers handlers for things the parser might find in the XML document (like start tags)"""
+
+toolchain = {'name': 'foss', 'version': '2015b'}
+toolchainopts = {'pic': True}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = [SOURCEFORGE_SOURCE]
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/e/expat/expat-2.1.0-intel-2016a.eb b/easybuild/easyconfigs/e/expat/expat-2.1.0-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..b0bbe713ec6cba35f360ce716231f48e77120441
--- /dev/null
+++ b/easybuild/easyconfigs/e/expat/expat-2.1.0-intel-2016a.eb
@@ -0,0 +1,16 @@
+easyblock = 'ConfigureMake'
+
+name = 'expat'
+version = '2.1.0'
+
+homepage = 'http://expat.sourceforge.net/'
+description = """Expat is an XML parser library written in C. It is a stream-oriented parser in which an application
+ registers handlers for things the parser might find in the XML document (like start tags)"""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+toolchainopts = {'pic': True}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = [SOURCEFORGE_SOURCE]
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/f/FASTA/FASTA-36.3.5e-goolf-1.4.10.eb b/easybuild/easyconfigs/f/FASTA/FASTA-36.3.5e-goolf-1.4.10.eb
index f7530e1017df2bbc7944b4a9fab649b370f1699b..c1501d5c82174ed3f0a01619d50c7a1937d58ec9 100644
--- a/easybuild/easyconfigs/f/FASTA/FASTA-36.3.5e-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/f/FASTA/FASTA-36.3.5e-goolf-1.4.10.eb
@@ -6,7 +6,7 @@
 # License::   MIT/GPL
 #
 ##
-easyblock='MakeCp'
+easyblock = 'MakeCp'
 
 name = "FASTA"
 version = "36.3.5e"
@@ -28,8 +28,8 @@ files_to_copy = ["bin", "conf", "data", "doc", "FASTA_LIST", "misc", "README", "
 sanity_check_paths = {
     'files': ["FASTA_LIST", "README"] + ['bin/%s' % x for x in ['lav2svg', 'lav2ps', 'map_db']] +
              ['bin/%s%%(version_major)s' % x for x in ['fasta', 'fastm', 'fastx', 'ggsearch', 'lalign', 'tfastf',
-                                                      'tfasts', 'tfasty', 'fastf', 'fasts', 'fasty', 'glsearch',
-                                                      'ssearch', 'tfastm', 'tfastx']],
+                                                       'tfasts', 'tfasty', 'fastf', 'fasts', 'fasty', 'glsearch',
+                                                       'ssearch', 'tfastm', 'tfastx']],
     'dirs': ["conf", "data", "doc", "misc", "seq", "sql", "test"]
 }
 
diff --git a/easybuild/easyconfigs/f/FASTA/FASTA-36.3.5e-ictce-5.3.0.eb b/easybuild/easyconfigs/f/FASTA/FASTA-36.3.5e-ictce-5.3.0.eb
index 8f618661801a697f9e7eb70fc3e864647d5a54b5..6b9a39e112c82c97d32a43476cd3a13a88f5a6cc 100644
--- a/easybuild/easyconfigs/f/FASTA/FASTA-36.3.5e-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/f/FASTA/FASTA-36.3.5e-ictce-5.3.0.eb
@@ -6,7 +6,7 @@
 # License::   MIT/GPL
 #
 ##
-easyblock='MakeCp'
+easyblock = 'MakeCp'
 
 name = "FASTA"
 version = "36.3.5e"
@@ -28,8 +28,8 @@ files_to_copy = ["bin", "conf", "data", "doc", "FASTA_LIST", "misc", "README", "
 sanity_check_paths = {
     'files': ["FASTA_LIST", "README"] + ['bin/%s' % x for x in ['lav2svg', 'lav2ps', 'map_db']] +
              ['bin/%s%%(version_major)s' % x for x in ['fasta', 'fastm', 'fastx', 'ggsearch', 'lalign', 'tfastf',
-                                                      'tfasts', 'tfasty', 'fastf', 'fasts', 'fasty', 'glsearch',
-                                                      'ssearch', 'tfastm', 'tfastx']],
+                                                       'tfasts', 'tfasty', 'fastf', 'fasts', 'fasty', 'glsearch',
+                                                       'ssearch', 'tfastm', 'tfastx']],
     'dirs': ["conf", "data", "doc", "misc", "seq", "sql", "test"]
 }
 
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 2fa88fc7e066998447bfd5dd5af960ad97edab06..4bda1588f1b51881cd4f32756c460216c09e9b30 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
@@ -26,20 +26,20 @@ altname = '_'.join(name.split('-')).lower()
 sources = ['%s-%s.tar.bz2' % (altname, version)]
 source_urls = ['http://hannonlab.cshl.edu/%s' % altname]
 
-dependencies = [('libgtextutils', '0.6.1')];
+dependencies = [('libgtextutils', '0.6.1')]
 
 sanity_check_paths = {
-                      '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 ['clipping_histogram.pl', 'formatter',
-                                                             'nucleotide_changer']] +
-                               ['bin/fastq_%s' % x for x in ['quality_boxplot_graph.sh', 'quality_converter',
-                                                             'to_fasta', 'quality_filter', 'quality_trimmer',
-                                                             'masker']],
-                      'dirs': ['.']
-                     }
+    '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 ['clipping_histogram.pl', 'formatter',
+                                           'nucleotide_changer']] +
+             ['bin/fastq_%s' % x for x in ['quality_boxplot_graph.sh', 'quality_converter',
+                                           'to_fasta', 'quality_filter', 'quality_trimmer',
+                                           'masker']],
+    'dirs': ['.']
+}
 
 moduleclass = 'bio'
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 b2711aa2a6d88db7f7d421e2a830a2e1179ddd82..3b0992eef6445201ad66f140bd27c6c6a60bdf6c 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
@@ -26,20 +26,20 @@ altname = '_'.join(name.split('-')).lower()
 sources = ['%s-%s.tar.bz2' % (altname, version)]
 source_urls = ['http://hannonlab.cshl.edu/%s' % altname]
 
-dependencies = [('libgtextutils', '0.6.1')];
+dependencies = [('libgtextutils', '0.6.1')]
 
 sanity_check_paths = {
-                      '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 ['clipping_histogram.pl', 'formatter',
-                                                             'nucleotide_changer']] +
-                               ['bin/fastq_%s' % x for x in ['quality_boxplot_graph.sh', 'quality_converter',
-                                                             'to_fasta', 'quality_filter', 'quality_trimmer',
-                                                             'masker']],
-                      'dirs': ['.']
-                     }
+    '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 ['clipping_histogram.pl', 'formatter',
+                                           'nucleotide_changer']] +
+             ['bin/fastq_%s' % x for x in ['quality_boxplot_graph.sh', 'quality_converter',
+                                           'to_fasta', 'quality_filter', 'quality_trimmer',
+                                           'masker']],
+    'dirs': ['.']
+}
 
 moduleclass = 'bio'
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 aaddc8190a9752078e8379e6426f3f55a1f91060..b9a9acd1bf62f3e677559576d2067fb1876ad009 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
@@ -26,22 +26,22 @@ altname = '_'.join(name.split('-')).lower()
 sources = ['%s-%s.tar.bz2' % (altname, version)]
 source_urls = ['http://hannonlab.cshl.edu/%s' % altname]
 
-dependencies = [('libgtextutils', '0.6.1')];
+dependencies = [('libgtextutils', '0.6.1')]
 
 configopts = '--disable-wall'  # avoid use of -Werror
 
 sanity_check_paths = {
-                      '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 ['clipping_histogram.pl', 'formatter',
-                                                             'nucleotide_changer']] +
-                               ['bin/fastq_%s' % x for x in ['quality_boxplot_graph.sh', 'quality_converter',
-                                                             'to_fasta', 'quality_filter', 'quality_trimmer',
-                                                             'masker']],
-                      'dirs': ['.']
-                     }
+    '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 ['clipping_histogram.pl', 'formatter',
+                                           'nucleotide_changer']] +
+             ['bin/fastq_%s' % x for x in ['quality_boxplot_graph.sh', 'quality_converter',
+                                           'to_fasta', 'quality_filter', 'quality_trimmer',
+                                           'masker']],
+    'dirs': ['.']
+}
 
 moduleclass = 'bio'
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 02992118cc80bb9a19cf529429c82ae9167ffe60..1f15e3521420f7dcc538dc480591d7ad6ff7717c 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
@@ -27,22 +27,22 @@ altname = '_'.join(name.split('-')).lower()
 sources = ['%s-%s.tar.bz2' % (altname, version)]
 source_urls = ['http://hannonlab.cshl.edu/%s' % altname]
 
-dependencies = [('libgtextutils', '0.6.1')];
+dependencies = [('libgtextutils', '0.6.1')]
 
 configopts = '--disable-wall'  # avoid use of -Werror
 
 sanity_check_paths = {
-                      '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 ['clipping_histogram.pl', 'formatter',
-                                                             'nucleotide_changer']] +
-                               ['bin/fastq_%s' % x for x in ['quality_boxplot_graph.sh', 'quality_converter',
-                                                             'to_fasta', 'quality_filter', 'quality_trimmer',
-                                                             'masker']],
-                      'dirs': ['.']
-                     }
+    '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 ['clipping_histogram.pl', 'formatter',
+                                           'nucleotide_changer']] +
+             ['bin/fastq_%s' % x for x in ['quality_boxplot_graph.sh', 'quality_converter',
+                                           'to_fasta', 'quality_filter', 'quality_trimmer',
+                                           'masker']],
+    'dirs': ['.']
+}
 
 moduleclass = 'bio'
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 46d174be2ccec1243f31090d4e6306aed14989ba..000e1a89b77047bae4cafdda81e85262718734db 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
@@ -25,20 +25,20 @@ toolchainopts = {'optarch': True, 'pic': True}
 source_urls = ['https://github.com/agordon/fastx_toolkit/releases/download/%(version)s']
 sources = ['fastx_toolkit-%(version)s.tar.bz2']
 
-builddependencies = [('libgtextutils', '0.7')];
+builddependencies = [('libgtextutils', '0.7')]
 
 sanity_check_paths = {
     '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']] +
+             'collapser', 'uncollapser', 'renamer', 'barcode_splitter.pl', 'nucleotide_distribution_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', 'to_fasta', 'quality_filter',
-            'quality_trimmer', 'masker']],
+             'quality_trimmer', 'masker']],
     'dirs': ['.']
-    }
+}
 
 moduleclass = 'bio'
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 16426d67887be135e52da9d3a1c35d072c95ee6a..1b0419e8b85477b7e540ff61c56b7f005cc125d9 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
@@ -22,24 +22,24 @@ description = """The FASTX-Toolkit is a collection of command line tools for
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 toolchainopts = {'optarch': True, 'pic': True}
 
-altname = name.lower().replace('-','_')
+altname = name.lower().replace('-', '_')
 source_urls = ['https://github.com/agordon/fastx_toolkit/releases/download/%(version)s']
 sources = ['%s-%%(version)s.tar.bz2' % altname]
 
-dependencies = [('libgtextutils', '0.6.1')];
+dependencies = [('libgtextutils', '0.6.1')]
 
 sanity_check_paths = {
     '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']] +
+             'collapser', 'uncollapser', 'renamer', 'barcode_splitter.pl', 'nucleotide_distribution_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', 'to_fasta', 'quality_filter',
-            'quality_trimmer', 'masker']],
+             'quality_trimmer', 'masker']],
     'dirs': ['.']
-    }
+}
 
 moduleclass = 'bio'
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 18c56837a0965f0a540bf828d4c08deccb38a58e..88eedbe24881816c0b8e6ff721634231ed6fe147 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
@@ -22,24 +22,24 @@ description = """The FASTX-Toolkit is a collection of command line tools for
 toolchain = {'name': 'intel', 'version': '2015a'}
 toolchainopts = {'optarch': True, 'pic': True}
 
-altname = name.lower().replace('-','_')
+altname = name.lower().replace('-', '_')
 source_urls = ['https://github.com/agordon/fastx_toolkit/releases/download/%(version)s']
 sources = ['%s-%%(version)s.tar.bz2' % altname]
 
-dependencies = [('libgtextutils', '0.6.1')];
+dependencies = [('libgtextutils', '0.6.1')]
 
 sanity_check_paths = {
     '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']] +
+             'collapser', 'uncollapser', 'renamer', 'barcode_splitter.pl', 'nucleotide_distribution_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', 'to_fasta', 'quality_filter',
-            'quality_trimmer', 'masker']],
+             'quality_trimmer', 'masker']],
     'dirs': ['.']
-    }
+}
 
 moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/f/FDS/FDS-6.0.1-no-OFED.eb b/easybuild/easyconfigs/f/FDS/FDS-6.0.1-no-OFED.eb
index f0c72251831e710652fe08705ced7bfaf8f9237b..a1ceee68c98071778a0c81c5d2d38ef79623aedc 100644
--- a/easybuild/easyconfigs/f/FDS/FDS-6.0.1-no-OFED.eb
+++ b/easybuild/easyconfigs/f/FDS/FDS-6.0.1-no-OFED.eb
@@ -16,7 +16,7 @@ sources = ['FDS_6.0.1-SMV_6.1.5_linux64.tar.gz']
 
 dependencies = [('OpenMPI', '1.6.5-GCC-4.8.2-no-OFED')]
 
-skipsteps= ['configure', 'build']
+skipsteps = ['configure', 'build']
 
 sanity_check_paths = {
     'files': ['bin/fds', 'bin/fds_mpi'],
diff --git a/easybuild/easyconfigs/f/FFC/FFC-1.0.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb b/easybuild/easyconfigs/f/FFC/FFC-1.0.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb
index e65ba501f924765cc31e543684946995819a5e43..6a8af569fc21cb9c7d509b64cb3a1a9aa6d496cf 100644
--- a/easybuild/easyconfigs/f/FFC/FFC-1.0.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/f/FFC/FFC-1.0.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb
@@ -20,16 +20,16 @@ pythonshortversion = ".".join(pythonversion.split(".")[:-1])
 versionsuffix = "-%s-%s" % (python, pythonversion)
 
 dependencies = [
-                (python, pythonversion),
-                ('UFL', '1.0.0', versionsuffix),
-                ('FIAT', '1.0.0', versionsuffix),
-                ('UFC', '2.0.5', versionsuffix),
-                ('Viper', '1.0.0', versionsuffix),
-               ]
+    (python, pythonversion),
+    ('UFL', '1.0.0', versionsuffix),
+    ('FIAT', '1.0.0', versionsuffix),
+    ('UFC', '2.0.5', versionsuffix),
+    ('Viper', '1.0.0', versionsuffix),
+]
 
 sanity_check_paths = {
-                      'files': ['bin/ffc'],
-                      'dirs': ['lib/python%s/site-packages/ffc' % pythonshortversion]
-                     }
+    'files': ['bin/ffc'],
+    'dirs': ['lib/python%s/site-packages/ffc' % pythonshortversion]
+}
 
 moduleclass = 'math'
diff --git a/easybuild/easyconfigs/f/FFC/FFC-1.0.0-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/f/FFC/FFC-1.0.0-goolf-1.4.10-Python-2.7.3.eb
index f26919582f539a74a3a16dce8321b830a794b2a6..f3d91879f4c9c1e64f2469d1f7b62d36b77e5a94 100644
--- a/easybuild/easyconfigs/f/FFC/FFC-1.0.0-goolf-1.4.10-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/f/FFC/FFC-1.0.0-goolf-1.4.10-Python-2.7.3.eb
@@ -20,16 +20,16 @@ pythonshortversion = ".".join(pythonversion.split(".")[:-1])
 versionsuffix = "-%s-%s" % (python, pythonversion)
 
 dependencies = [
-                (python, pythonversion),
-                ('UFL', '1.0.0', versionsuffix),
-                ('FIAT', '1.0.0', versionsuffix),
-                ('UFC', '2.0.5', versionsuffix),
-                ('Viper', '1.0.0', versionsuffix),
-               ]
+    (python, pythonversion),
+    ('UFL', '1.0.0', versionsuffix),
+    ('FIAT', '1.0.0', versionsuffix),
+    ('UFC', '2.0.5', versionsuffix),
+    ('Viper', '1.0.0', versionsuffix),
+]
 
 sanity_check_paths = {
-                      'files': ['bin/ffc'],
-                      'dirs': ['lib/python%s/site-packages/ffc' % pythonshortversion]
-                     }
+    'files': ['bin/ffc'],
+    'dirs': ['lib/python%s/site-packages/ffc' % pythonshortversion]
+}
 
 moduleclass = 'math'
diff --git a/easybuild/easyconfigs/f/FFC/FFC-1.0.0-ictce-4.0.6-Python-2.7.3.eb b/easybuild/easyconfigs/f/FFC/FFC-1.0.0-ictce-4.0.6-Python-2.7.3.eb
index 97fb1dceaa06e4eef522d7ac285f8e62a94e880a..aff35de683da191fdf9d5dbb68fe56b883cde010 100644
--- a/easybuild/easyconfigs/f/FFC/FFC-1.0.0-ictce-4.0.6-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/f/FFC/FFC-1.0.0-ictce-4.0.6-Python-2.7.3.eb
@@ -20,16 +20,16 @@ pythonshortversion = ".".join(pythonversion.split(".")[:-1])
 versionsuffix = "-%s-%s" % (python, pythonversion)
 
 dependencies = [
-                (python, pythonversion),
-                ('UFL', '1.0.0', versionsuffix),
-                ('FIAT', '1.0.0', versionsuffix),
-                ('UFC', '2.0.5', versionsuffix),
-                ('Viper', '1.0.0', versionsuffix),
-               ]
+    (python, pythonversion),
+    ('UFL', '1.0.0', versionsuffix),
+    ('FIAT', '1.0.0', versionsuffix),
+    ('UFC', '2.0.5', versionsuffix),
+    ('Viper', '1.0.0', versionsuffix),
+]
 
 sanity_check_paths = {
-                      'files': ['bin/ffc'],
-                      'dirs': ['lib/python%s/site-packages/ffc' % pythonshortversion]
-                     }
+    'files': ['bin/ffc'],
+    'dirs': ['lib/python%s/site-packages/ffc' % pythonshortversion]
+}
 
 moduleclass = 'math'
diff --git a/easybuild/easyconfigs/f/FFC/FFC-1.0.0-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/f/FFC/FFC-1.0.0-ictce-5.3.0-Python-2.7.3.eb
index fbc743734d1cd5376bdba180af3c97e9c9081fd3..646f52f87403d1407a48d4c268abc80f3684fbf3 100644
--- a/easybuild/easyconfigs/f/FFC/FFC-1.0.0-ictce-5.3.0-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/f/FFC/FFC-1.0.0-ictce-5.3.0-Python-2.7.3.eb
@@ -21,16 +21,16 @@ pythonshortversion = ".".join(pythonversion.split(".")[:-1])
 versionsuffix = "-%s-%s" % (python, pythonversion)
 
 dependencies = [
-                (python, pythonversion),
-                ('UFL', '1.0.0', versionsuffix),
-                ('FIAT', '1.0.0', versionsuffix),
-                ('UFC', '2.0.5', versionsuffix),
-                ('Viper', '1.0.0', versionsuffix),
-               ]
+    (python, pythonversion),
+    ('UFL', '1.0.0', versionsuffix),
+    ('FIAT', '1.0.0', versionsuffix),
+    ('UFC', '2.0.5', versionsuffix),
+    ('Viper', '1.0.0', versionsuffix),
+]
 
 sanity_check_paths = {
-                      'files': ['bin/ffc'],
-                      'dirs': ['lib/python%s/site-packages/ffc' % pythonshortversion]
-                     }
+    'files': ['bin/ffc'],
+    'dirs': ['lib/python%s/site-packages/ffc' % pythonshortversion]
+}
 
 moduleclass = 'math'
diff --git a/easybuild/easyconfigs/f/FFTW/FFTW-2.1.5-gompi-1.1.0-no-OFED.eb b/easybuild/easyconfigs/f/FFTW/FFTW-2.1.5-gompi-1.1.0-no-OFED.eb
index 207690907c36140eecd03841fc8d3d3a2c1096bb..2e1dfdd8af153be258369b39472db6f725e07c07 100644
--- a/easybuild/easyconfigs/f/FFTW/FFTW-2.1.5-gompi-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/f/FFTW/FFTW-2.1.5-gompi-1.1.0-no-OFED.eb
@@ -23,7 +23,8 @@ configopts = [
 sanity_check_paths = {
     'files': ['include/%sfftw%s.h' % (x, y) for x in ['d', 'dr', 's', 'sr'] for y in ['', '_mpi', '_threads']] +
              ['lib/lib%sfftw%s.a' % (x, y) for x in ['d', 'dr', 's', 'sr'] for y in ['', '_mpi', '_threads']] +
-             ['lib/lib%sfftw%s.%s' % (x, y, SHLIB_EXT) for x in ['d', 'dr', 's', 'sr'] for y in ['', '_mpi', '_threads']],
+             ['lib/lib%sfftw%s.%s' % (x, y, SHLIB_EXT) for x in ['d', 'dr', 's', 'sr']
+              for y in ['', '_mpi', '_threads']],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/f/FFTW/FFTW-2.1.5-ictce-5.3.0.eb b/easybuild/easyconfigs/f/FFTW/FFTW-2.1.5-ictce-5.3.0.eb
index 27849ede43f1d48b08e69fd0cdf5684767e14b7e..4dafd1540fabe39f6b4e6fa4318b216e2dddc173 100644
--- a/easybuild/easyconfigs/f/FFTW/FFTW-2.1.5-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/f/FFTW/FFTW-2.1.5-ictce-5.3.0.eb
@@ -23,7 +23,8 @@ configopts = [
 sanity_check_paths = {
     'files': ['include/%sfftw%s.h' % (x, y) for x in ['d', 'dr', 's', 'sr'] for y in ['', '_mpi', '_threads']] +
              ['lib/lib%sfftw%s.a' % (x, y) for x in ['d', 'dr', 's', 'sr'] for y in ['', '_mpi', '_threads']] +
-             ['lib/lib%sfftw%s.%s' % (x, y, SHLIB_EXT) for x in ['d', 'dr', 's', 'sr'] for y in ['', '_mpi', '_threads']],
+             ['lib/lib%sfftw%s.%s' % (x, y, SHLIB_EXT) for x in ['d', 'dr', 's', 'sr']
+              for y in ['', '_mpi', '_threads']],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/f/FFTW/FFTW-2.1.5-ictce-5.5.0.eb b/easybuild/easyconfigs/f/FFTW/FFTW-2.1.5-ictce-5.5.0.eb
index a551eedc1d1362dcd3eebbc69e01db44dcf6b981..e665c5c10186cc3f3df9e7d79304f217d6b0df3b 100644
--- a/easybuild/easyconfigs/f/FFTW/FFTW-2.1.5-ictce-5.5.0.eb
+++ b/easybuild/easyconfigs/f/FFTW/FFTW-2.1.5-ictce-5.5.0.eb
@@ -23,7 +23,8 @@ configopts = [
 sanity_check_paths = {
     'files': ['include/%sfftw%s.h' % (x, y) for x in ['d', 'dr', 's', 'sr'] for y in ['', '_mpi', '_threads']] +
              ['lib/lib%sfftw%s.a' % (x, y) for x in ['d', 'dr', 's', 'sr'] for y in ['', '_mpi', '_threads']] +
-             ['lib/lib%sfftw%s.%s' % (x, y, SHLIB_EXT) for x in ['d', 'dr', 's', 'sr'] for y in ['', '_mpi', '_threads']],
+             ['lib/lib%sfftw%s.%s' % (x, y, SHLIB_EXT) for x in ['d', 'dr', 's', 'sr']
+              for y in ['', '_mpi', '_threads']],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/f/FFTW/FFTW-3.3.1-gompi-1.1.0-no-OFED.eb b/easybuild/easyconfigs/f/FFTW/FFTW-3.3.1-gompi-1.1.0-no-OFED.eb
index df746888b87a52a5be779e373d3deeeec920b226..0870e0a4fd8f02803e332431068a5160e2add8ce 100644
--- a/easybuild/easyconfigs/f/FFTW/FFTW-3.3.1-gompi-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/f/FFTW/FFTW-3.3.1-gompi-1.1.0-no-OFED.eb
@@ -26,8 +26,8 @@ sanity_check_paths = {
     'files': ['bin/fftw%s' % x for x in ['-wisdom', '-wisdom-to-conf', 'f-wisdom', 'l-wisdom', 'q-wisdom']] +
              ['include/fftw3%s' % x for x in ['-mpi.f03', '-mpi.h', '.f', '.f03',
                                               '.h', 'l-mpi.f03', 'l.f03', 'q.f03']] +
-            ['lib/libfftw3%s%s.a' % (x, y) for x in ['', 'f', 'l'] for y in ['', '_mpi', '_omp', '_threads']] +
-            ['lib/libfftw3q.a', 'lib/libfftw3q_omp.a'],
+             ['lib/libfftw3%s%s.a' % (x, y) for x in ['', 'f', 'l'] for y in ['', '_mpi', '_omp', '_threads']] +
+             ['lib/libfftw3q.a', 'lib/libfftw3q_omp.a'],
     'dirs': ['lib/pkgconfig'],
 }
 
diff --git a/easybuild/easyconfigs/f/FFTW/FFTW-3.3.2-gmvapich2-1.7.9a2.eb b/easybuild/easyconfigs/f/FFTW/FFTW-3.3.2-gmvapich2-1.7.9a2.eb
index f3605b72054e5cb912c6d1dbc0a659ace00e4940..39962ff9f0d26a697f9b60d79ab508113d4ea158 100644
--- a/easybuild/easyconfigs/f/FFTW/FFTW-3.3.2-gmvapich2-1.7.9a2.eb
+++ b/easybuild/easyconfigs/f/FFTW/FFTW-3.3.2-gmvapich2-1.7.9a2.eb
@@ -26,8 +26,8 @@ sanity_check_paths = {
     'files': ['bin/fftw%s' % x for x in ['-wisdom', '-wisdom-to-conf', 'f-wisdom', 'l-wisdom', 'q-wisdom']] +
              ['include/fftw3%s' % x for x in ['-mpi.f03', '-mpi.h', '.f', '.f03',
                                               '.h', 'l-mpi.f03', 'l.f03', 'q.f03']] +
-            ['lib/libfftw3%s%s.a' % (x, y) for x in ['', 'f', 'l'] for y in ['', '_mpi', '_omp', '_threads']] +
-            ['lib/libfftw3q.a', 'lib/libfftw3q_omp.a'],
+             ['lib/libfftw3%s%s.a' % (x, y) for x in ['', 'f', 'l'] for y in ['', '_mpi', '_omp', '_threads']] +
+             ['lib/libfftw3q.a', 'lib/libfftw3q_omp.a'],
     'dirs': ['lib/pkgconfig'],
 }
 
diff --git a/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-gmpich-1.4.8.eb b/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-gmpich-1.4.8.eb
index 34bdcce1b8be37ef6bd0664d7c9c418eafdb5975..50af5b9be23f3460e4e8885c30e30abbee4894d9 100644
--- a/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-gmpich-1.4.8.eb
+++ b/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-gmpich-1.4.8.eb
@@ -26,8 +26,8 @@ sanity_check_paths = {
     'files': ['bin/fftw%s' % x for x in ['-wisdom', '-wisdom-to-conf', 'f-wisdom', 'l-wisdom', 'q-wisdom']] +
              ['include/fftw3%s' % x for x in ['-mpi.f03', '-mpi.h', '.f', '.f03',
                                               '.h', 'l-mpi.f03', 'l.f03', 'q.f03']] +
-            ['lib/libfftw3%s%s.a' % (x, y) for x in ['', 'f', 'l'] for y in ['', '_mpi', '_omp', '_threads']] +
-            ['lib/libfftw3q.a', 'lib/libfftw3q_omp.a'],
+             ['lib/libfftw3%s%s.a' % (x, y) for x in ['', 'f', 'l'] for y in ['', '_mpi', '_omp', '_threads']] +
+             ['lib/libfftw3q.a', 'lib/libfftw3q_omp.a'],
     'dirs': ['lib/pkgconfig'],
 }
 
diff --git a/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-gmvapich2-1.7.12.eb b/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-gmvapich2-1.7.12.eb
index dbbb079aaf6b50d3f5c9a9aad9b9365705bb3258..a179659dbf75e17318bb60f31dc69bb781b1cb47 100644
--- a/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-gmvapich2-1.7.12.eb
+++ b/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-gmvapich2-1.7.12.eb
@@ -26,8 +26,8 @@ sanity_check_paths = {
     'files': ['bin/fftw%s' % x for x in ['-wisdom', '-wisdom-to-conf', 'f-wisdom', 'l-wisdom', 'q-wisdom']] +
              ['include/fftw3%s' % x for x in ['-mpi.f03', '-mpi.h', '.f', '.f03',
                                               '.h', 'l-mpi.f03', 'l.f03', 'q.f03']] +
-            ['lib/libfftw3%s%s.a' % (x, y) for x in ['', 'f', 'l'] for y in ['', '_mpi', '_omp', '_threads']] +
-            ['lib/libfftw3q.a', 'lib/libfftw3q_omp.a'],
+             ['lib/libfftw3%s%s.a' % (x, y) for x in ['', 'f', 'l'] for y in ['', '_mpi', '_omp', '_threads']] +
+             ['lib/libfftw3q.a', 'lib/libfftw3q_omp.a'],
     'dirs': ['lib/pkgconfig'],
 }
 
diff --git a/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-gmvapich2-1.7.12rc1.eb b/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-gmvapich2-1.7.12rc1.eb
index 7c08b5de116fcb5c696778d2d704047c1aa55580..a5ea76020c20cf7690a7a34959309804a36832b2 100644
--- a/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-gmvapich2-1.7.12rc1.eb
+++ b/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-gmvapich2-1.7.12rc1.eb
@@ -27,8 +27,8 @@ sanity_check_paths = {
                                          'l-wisdom', 'q-wisdom']] +
              ['include/fftw3%s' % x for x in ['-mpi.f03', '-mpi.h', '.f', '.f03',
                                               '.h', 'l-mpi.f03', 'l.f03', 'q.f03']] +
-            ['lib/libfftw3%s%s.a' % (x, y) for x in ['', 'f', 'l'] for y in ['', '_mpi', '_omp', '_threads']] +
-            ['lib/libfftw3q.a', 'lib/libfftw3q_omp.a'],
+             ['lib/libfftw3%s%s.a' % (x, y) for x in ['', 'f', 'l'] for y in ['', '_mpi', '_omp', '_threads']] +
+             ['lib/libfftw3q.a', 'lib/libfftw3q_omp.a'],
     'dirs': ['lib/pkgconfig'],
 }
 
diff --git a/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-gompi-1.3.12.eb b/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-gompi-1.3.12.eb
index b7323c4cfc305de347b4b27c34db20e446d0906a..cf777562eead552c44721ec4c0e76aeb3b973cd1 100644
--- a/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-gompi-1.3.12.eb
+++ b/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-gompi-1.3.12.eb
@@ -27,8 +27,8 @@ sanity_check_paths = {
                                          'l-wisdom', 'q-wisdom']] +
              ['include/fftw3%s' % x for x in ['-mpi.f03', '-mpi.h', '.f', '.f03',
                                               '.h', 'l-mpi.f03', 'l.f03', 'q.f03']] +
-            ['lib/libfftw3%s%s.a' % (x, y) for x in ['', 'f', 'l'] for y in ['', '_mpi', '_omp', '_threads']] +
-            ['lib/libfftw3q.a', 'lib/libfftw3q_omp.a'],
+             ['lib/libfftw3%s%s.a' % (x, y) for x in ['', 'f', 'l'] for y in ['', '_mpi', '_omp', '_threads']] +
+             ['lib/libfftw3q.a', 'lib/libfftw3q_omp.a'],
     'dirs': ['lib/pkgconfig'],
 }
 
diff --git a/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-gompi-1.4.10-no-OFED.eb b/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-gompi-1.4.10-no-OFED.eb
index b4a9a90a0141c0d7faec71f1a95e0c156f1377ed..1c3d9dac4d36c38b4f7971c0f4804ff946c3e62a 100644
--- a/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-gompi-1.4.10-no-OFED.eb
+++ b/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-gompi-1.4.10-no-OFED.eb
@@ -26,8 +26,8 @@ sanity_check_paths = {
     'files': ['bin/fftw%s' % x for x in ['-wisdom', '-wisdom-to-conf', 'f-wisdom', 'l-wisdom', 'q-wisdom']] +
              ['include/fftw3%s' % x for x in ['-mpi.f03', '-mpi.h', '.f', '.f03',
                                               '.h', 'l-mpi.f03', 'l.f03', 'q.f03']] +
-            ['lib/libfftw3%s%s.a' % (x, y) for x in ['', 'f', 'l'] for y in ['', '_mpi', '_omp', '_threads']] +
-            ['lib/libfftw3q.a', 'lib/libfftw3q_omp.a'],
+             ['lib/libfftw3%s%s.a' % (x, y) for x in ['', 'f', 'l'] for y in ['', '_mpi', '_omp', '_threads']] +
+             ['lib/libfftw3q.a', 'lib/libfftw3q_omp.a'],
     'dirs': ['lib/pkgconfig'],
 }
 
diff --git a/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-gompi-1.4.10.eb b/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-gompi-1.4.10.eb
index bc93d09c52e675559fe8ed5f5e3b7ada33b0514f..bc9593354f40faa63a3a63f32c4344f833224af7 100644
--- a/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-gompi-1.4.10.eb
+++ b/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-gompi-1.4.10.eb
@@ -26,8 +26,8 @@ sanity_check_paths = {
     'files': ['bin/fftw%s' % x for x in ['-wisdom', '-wisdom-to-conf', 'f-wisdom', 'l-wisdom', 'q-wisdom']] +
              ['include/fftw3%s' % x for x in ['-mpi.f03', '-mpi.h', '.f', '.f03',
                                               '.h', 'l-mpi.f03', 'l.f03', 'q.f03']] +
-            ['lib/libfftw3%s%s.a' % (x, y) for x in ['', 'f', 'l'] for y in ['', '_mpi', '_omp', '_threads']] +
-            ['lib/libfftw3q.a', 'lib/libfftw3q_omp.a'],
+             ['lib/libfftw3%s%s.a' % (x, y) for x in ['', 'f', 'l'] for y in ['', '_mpi', '_omp', '_threads']] +
+             ['lib/libfftw3q.a', 'lib/libfftw3q_omp.a'],
     'dirs': ['lib/pkgconfig'],
 }
 
diff --git a/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-gompi-1.5.12-no-OFED.eb b/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-gompi-1.5.12-no-OFED.eb
index 6ce64fb09e1ca179198f7c46522bdc0b097c9504..ef28bb596b7757efe2b54fdefc493b7a68bbfd2a 100644
--- a/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-gompi-1.5.12-no-OFED.eb
+++ b/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-gompi-1.5.12-no-OFED.eb
@@ -26,8 +26,8 @@ sanity_check_paths = {
     'files': ['bin/fftw%s' % x for x in ['-wisdom', '-wisdom-to-conf', 'f-wisdom', 'l-wisdom', 'q-wisdom']] +
              ['include/fftw3%s' % x for x in ['-mpi.f03', '-mpi.h', '.f', '.f03',
                                               '.h', 'l-mpi.f03', 'l.f03', 'q.f03']] +
-            ['lib/libfftw3%s%s.a' % (x, y) for x in ['', 'f', 'l'] for y in ['', '_mpi', '_omp', '_threads']] +
-            ['lib/libfftw3q.a', 'lib/libfftw3q_omp.a'],
+             ['lib/libfftw3%s%s.a' % (x, y) for x in ['', 'f', 'l'] for y in ['', '_mpi', '_omp', '_threads']] +
+             ['lib/libfftw3q.a', 'lib/libfftw3q_omp.a'],
     'dirs': ['lib/pkgconfig'],
 }
 
diff --git a/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-gompi-1.5.12.eb b/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-gompi-1.5.12.eb
index a07a8a5b7a5c19e9f1874fd97dd9a57576cec4d6..a66c54abe404efbb2503f6c385f1c510fa833c17 100644
--- a/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-gompi-1.5.12.eb
+++ b/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-gompi-1.5.12.eb
@@ -26,8 +26,8 @@ sanity_check_paths = {
     'files': ['bin/fftw%s' % x for x in ['-wisdom', '-wisdom-to-conf', 'f-wisdom', 'l-wisdom', 'q-wisdom']] +
              ['include/fftw3%s' % x for x in ['-mpi.f03', '-mpi.h', '.f', '.f03',
                                               '.h', 'l-mpi.f03', 'l.f03', 'q.f03']] +
-            ['lib/libfftw3%s%s.a' % (x, y) for x in ['', 'f', 'l'] for y in ['', '_mpi', '_omp', '_threads']] +
-            ['lib/libfftw3q.a', 'lib/libfftw3q_omp.a'],
+             ['lib/libfftw3%s%s.a' % (x, y) for x in ['', 'f', 'l'] for y in ['', '_mpi', '_omp', '_threads']] +
+             ['lib/libfftw3q.a', 'lib/libfftw3q_omp.a'],
     'dirs': ['lib/pkgconfig'],
 }
 
diff --git a/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-gompi-1.6.10.eb b/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-gompi-1.6.10.eb
index 9273c85cd6cd9628ba6d1c8fdebb7416e5d241fe..43a89950f17fe0185f651824ce71a49a9d0e4b9d 100644
--- a/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-gompi-1.6.10.eb
+++ b/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-gompi-1.6.10.eb
@@ -26,8 +26,8 @@ sanity_check_paths = {
     'files': ['bin/fftw%s' % x for x in ['-wisdom', '-wisdom-to-conf', 'f-wisdom', 'l-wisdom', 'q-wisdom']] +
              ['include/fftw3%s' % x for x in ['-mpi.f03', '-mpi.h', '.f', '.f03',
                                               '.h', 'l-mpi.f03', 'l.f03', 'q.f03']] +
-            ['lib/libfftw3%s%s.a' % (x, y) for x in ['', 'f', 'l'] for y in ['', '_mpi', '_omp', '_threads']] +
-            ['lib/libfftw3q.a', 'lib/libfftw3q_omp.a'],
+             ['lib/libfftw3%s%s.a' % (x, y) for x in ['', 'f', 'l'] for y in ['', '_mpi', '_omp', '_threads']] +
+             ['lib/libfftw3q.a', 'lib/libfftw3q_omp.a'],
     'dirs': ['lib/pkgconfig'],
 }
 
diff --git a/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-gompic-2.6.10.eb b/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-gompic-2.6.10.eb
index 23271fb82e149d002178af3bf884255d5c36b0a9..52dc0f06628694cc75e78dd54183863540796560 100644
--- a/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-gompic-2.6.10.eb
+++ b/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-gompic-2.6.10.eb
@@ -26,8 +26,8 @@ sanity_check_paths = {
     'files': ['bin/fftw%s' % x for x in ['-wisdom', '-wisdom-to-conf', 'f-wisdom', 'l-wisdom', 'q-wisdom']] +
              ['include/fftw3%s' % x for x in ['-mpi.f03', '-mpi.h', '.f', '.f03',
                                               '.h', 'l-mpi.f03', 'l.f03', 'q.f03']] +
-            ['lib/libfftw3%s%s.a' % (x, y) for x in ['', 'f', 'l'] for y in ['', '_mpi', '_omp', '_threads']] +
-            ['lib/libfftw3q.a', 'lib/libfftw3q_omp.a'],
+             ['lib/libfftw3%s%s.a' % (x, y) for x in ['', 'f', 'l'] for y in ['', '_mpi', '_omp', '_threads']] +
+             ['lib/libfftw3q.a', 'lib/libfftw3q_omp.a'],
     'dirs': ['lib/pkgconfig'],
 }
 
diff --git a/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-ictce-4.1.13-single.eb b/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-ictce-4.1.13-single.eb
index 6d022e31326f634399263a37baf7112063b5b117..b4152bae556a2f38045ba5cc46203c2d72ccb9ea 100644
--- a/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-ictce-4.1.13-single.eb
+++ b/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-ictce-4.1.13-single.eb
@@ -14,7 +14,7 @@ toolchainopts = {'optarch': True, 'pic': True}
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = [homepage]
 
-## single precision
+# single precision
 configopts = "--enable-sse --enable-single"
 
 # the MPI opts from FFTW2 are valid options but unused until FFTW3.3
diff --git a/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-ictce-5.2.0-single.eb b/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-ictce-5.2.0-single.eb
index 15438c043075159c0623f6a206e7ac3a4bac90d6..c3d56eb83cbafbf0ae8394e902df397073a88652 100644
--- a/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-ictce-5.2.0-single.eb
+++ b/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-ictce-5.2.0-single.eb
@@ -14,7 +14,7 @@ toolchainopts = {'optarch': True, 'pic': True}
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = [homepage]
 
-## single precision
+# single precision
 configopts = "--enable-sse --enable-single"
 
 # the MPI opts from FFTW2 are valid options but unused until FFTW3.3
diff --git a/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-ictce-5.3.0-single.eb b/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-ictce-5.3.0-single.eb
index 1212e33f880a9711f59c51be6a097f18d3870681..5755a3492e5935f3aa259981da39e50ee8390725 100644
--- a/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-ictce-5.3.0-single.eb
+++ b/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-ictce-5.3.0-single.eb
@@ -14,7 +14,7 @@ toolchainopts = {'optarch': True, 'pic': True}
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = [homepage]
 
-## single precision
+# single precision
 configopts = "--enable-sse --enable-single"
 
 # the MPI opts from FFTW2 are valid options but unused until FFTW3.3
diff --git a/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-iomkl-4.6.13-single.eb b/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-iomkl-4.6.13-single.eb
index 4bdecb5bb1bed58d0c4232e1f440e6d53a6565d9..614cce8c967d53231f89acbf23f48113b7d7911e 100644
--- a/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-iomkl-4.6.13-single.eb
+++ b/easybuild/easyconfigs/f/FFTW/FFTW-3.3.3-iomkl-4.6.13-single.eb
@@ -14,7 +14,7 @@ toolchainopts = {'optarch': True, 'pic': True}
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = [homepage]
 
-## single precision
+# single precision
 configopts = "--enable-sse --enable-single"
 
 # the MPI opts from FFTW2 are valid options but unused until FFTW3.3
diff --git a/easybuild/easyconfigs/f/FFTW/FFTW-3.3.4-gmvapich2-1.7.12.eb b/easybuild/easyconfigs/f/FFTW/FFTW-3.3.4-gmvapich2-1.7.12.eb
index 7a9d4c279e1cf7f944e8081f6971de24fec2e3e5..1c30e5053405fa3ef7298291a1bc8188f5a9a6f6 100644
--- a/easybuild/easyconfigs/f/FFTW/FFTW-3.3.4-gmvapich2-1.7.12.eb
+++ b/easybuild/easyconfigs/f/FFTW/FFTW-3.3.4-gmvapich2-1.7.12.eb
@@ -26,8 +26,8 @@ sanity_check_paths = {
     'files': ['bin/fftw%s' % x for x in ['-wisdom', '-wisdom-to-conf', 'f-wisdom', 'l-wisdom', 'q-wisdom']] +
              ['include/fftw3%s' % x for x in ['-mpi.f03', '-mpi.h', '.f', '.f03',
                                               '.h', 'l-mpi.f03', 'l.f03', 'q.f03']] +
-            ['lib/libfftw3%s%s.a' % (x, y) for x in ['', 'f', 'l'] for y in ['', '_mpi', '_omp', '_threads']] +
-            ['lib/libfftw3q.a', 'lib/libfftw3q_omp.a'],
+             ['lib/libfftw3%s%s.a' % (x, y) for x in ['', 'f', 'l'] for y in ['', '_mpi', '_omp', '_threads']] +
+             ['lib/libfftw3q.a', 'lib/libfftw3q_omp.a'],
     'dirs': ['lib/pkgconfig'],
 }
 
diff --git a/easybuild/easyconfigs/f/FFTW/FFTW-3.3.4-gompi-1.5.14-no-OFED.eb b/easybuild/easyconfigs/f/FFTW/FFTW-3.3.4-gompi-1.5.14-no-OFED.eb
index 128daff670844540be0503e56343b05da557a4a8..38fbcdb5bcc558df3b65e31149958eeecb3697f6 100644
--- a/easybuild/easyconfigs/f/FFTW/FFTW-3.3.4-gompi-1.5.14-no-OFED.eb
+++ b/easybuild/easyconfigs/f/FFTW/FFTW-3.3.4-gompi-1.5.14-no-OFED.eb
@@ -26,8 +26,8 @@ sanity_check_paths = {
     'files': ['bin/fftw%s' % x for x in ['-wisdom', '-wisdom-to-conf', 'f-wisdom', 'l-wisdom', 'q-wisdom']] +
              ['include/fftw3%s' % x for x in ['-mpi.f03', '-mpi.h', '.f', '.f03',
                                               '.h', 'l-mpi.f03', 'l.f03', 'q.f03']] +
-            ['lib/libfftw3%s%s.a' % (x, y) for x in ['', 'f', 'l'] for y in ['', '_mpi', '_omp', '_threads']] +
-            ['lib/libfftw3q.a', 'lib/libfftw3q_omp.a'],
+             ['lib/libfftw3%s%s.a' % (x, y) for x in ['', 'f', 'l'] for y in ['', '_mpi', '_omp', '_threads']] +
+             ['lib/libfftw3q.a', 'lib/libfftw3q_omp.a'],
     'dirs': ['lib/pkgconfig'],
 }
 
diff --git a/easybuild/easyconfigs/f/FFTW/FFTW-3.3.4-gompi-1.5.14.eb b/easybuild/easyconfigs/f/FFTW/FFTW-3.3.4-gompi-1.5.14.eb
index 31bdfdd9569dffa5ca7179028779698f9348a016..0e6bf98a4890f08cddce390d9823ba0f745daf89 100644
--- a/easybuild/easyconfigs/f/FFTW/FFTW-3.3.4-gompi-1.5.14.eb
+++ b/easybuild/easyconfigs/f/FFTW/FFTW-3.3.4-gompi-1.5.14.eb
@@ -26,8 +26,8 @@ sanity_check_paths = {
     'files': ['bin/fftw%s' % x for x in ['-wisdom', '-wisdom-to-conf', 'f-wisdom', 'l-wisdom', 'q-wisdom']] +
              ['include/fftw3%s' % x for x in ['-mpi.f03', '-mpi.h', '.f', '.f03',
                                               '.h', 'l-mpi.f03', 'l.f03', 'q.f03']] +
-            ['lib/libfftw3%s%s.a' % (x, y) for x in ['', 'f', 'l'] for y in ['', '_mpi', '_omp', '_threads']] +
-            ['lib/libfftw3q.a', 'lib/libfftw3q_omp.a'],
+             ['lib/libfftw3%s%s.a' % (x, y) for x in ['', 'f', 'l'] for y in ['', '_mpi', '_omp', '_threads']] +
+             ['lib/libfftw3q.a', 'lib/libfftw3q_omp.a'],
     'dirs': ['lib/pkgconfig'],
 }
 
diff --git a/easybuild/easyconfigs/f/FFTW/FFTW-3.3.4-gompi-1.5.16.eb b/easybuild/easyconfigs/f/FFTW/FFTW-3.3.4-gompi-1.5.16.eb
index 6ae444ae025f221e3e5c742284084a0c5aabf013..34e8f524fbb1fbacbe340cfc5e0a2421ac28c521 100644
--- a/easybuild/easyconfigs/f/FFTW/FFTW-3.3.4-gompi-1.5.16.eb
+++ b/easybuild/easyconfigs/f/FFTW/FFTW-3.3.4-gompi-1.5.16.eb
@@ -26,8 +26,8 @@ sanity_check_paths = {
     'files': ['bin/fftw%s' % x for x in ['-wisdom', '-wisdom-to-conf', 'f-wisdom', 'l-wisdom', 'q-wisdom']] +
              ['include/fftw3%s' % x for x in ['-mpi.f03', '-mpi.h', '.f', '.f03',
                                               '.h', 'l-mpi.f03', 'l.f03', 'q.f03']] +
-            ['lib/libfftw3%s%s.a' % (x, y) for x in ['', 'f', 'l'] for y in ['', '_mpi', '_omp', '_threads']] +
-            ['lib/libfftw3q.a', 'lib/libfftw3q_omp.a'],
+             ['lib/libfftw3%s%s.a' % (x, y) for x in ['', 'f', 'l'] for y in ['', '_mpi', '_omp', '_threads']] +
+             ['lib/libfftw3q.a', 'lib/libfftw3q_omp.a'],
     'dirs': ['lib/pkgconfig'],
 }
 
diff --git a/easybuild/easyconfigs/f/FFTW/FFTW-3.3.4-gpsmpi-2014.12.eb b/easybuild/easyconfigs/f/FFTW/FFTW-3.3.4-gpsmpi-2014.12.eb
index cb01772a4f89815dd80dabaefe658db6d327daed..14eb6c4917d3c7f86e89778bc58dd3140a23c13c 100644
--- a/easybuild/easyconfigs/f/FFTW/FFTW-3.3.4-gpsmpi-2014.12.eb
+++ b/easybuild/easyconfigs/f/FFTW/FFTW-3.3.4-gpsmpi-2014.12.eb
@@ -22,7 +22,6 @@ configopts = [
 ]
 
 
-
 sanity_check_paths = {
     'files': ['bin/fftw%s' % x for x in ['-wisdom', '-wisdom-to-conf', 'f-wisdom', 'l-wisdom', 'q-wisdom']] +
              ['include/fftw3%s' % x for x in ['-mpi.f03', '-mpi.h', '.f', '.f03',
@@ -33,4 +32,3 @@ sanity_check_paths = {
 }
 
 moduleclass = 'numlib'
-
diff --git a/easybuild/easyconfigs/f/FFmpeg/FFmpeg-0.10.16-gimkl-2.11.5.eb b/easybuild/easyconfigs/f/FFmpeg/FFmpeg-0.10.16-gimkl-2.11.5.eb
new file mode 100644
index 0000000000000000000000000000000000000000..7c1be39c96bbfb6a533f98db5b26b9347fe0c104
--- /dev/null
+++ b/easybuild/easyconfigs/f/FFmpeg/FFmpeg-0.10.16-gimkl-2.11.5.eb
@@ -0,0 +1,30 @@
+easyblock = 'ConfigureMake'
+
+name = 'FFmpeg'
+version = '0.10.16'
+
+homepage = 'https://www.ffmpeg.org/'
+description = """A complete, cross-platform solution to record, convert and stream audio and video."""
+
+toolchain = {'name': 'gimkl', 'version': '2.11.5'}
+
+sources = [SOURCELOWER_TAR_BZ2]
+source_urls = ['http://ffmpeg.org/releases/']
+
+dependencies = [
+    ('NASM', '2.11.08'),
+    ('zlib', '1.2.8'),
+    ('x264', '20160114'),
+]
+
+configopts = '--enable-pic --enable-shared --enable-gpl --enable-version3 --enable-nonfree --cc="$CC" --cxx="$CXX" '
+configopts += '--enable-libx264'
+
+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',
+                                                'swresample', 'swscale', 'avutil'] for y in ['so', 'a']],
+    'dirs': ['include']
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/f/FFmpeg/FFmpeg-0.10.16-intel-2016a.eb b/easybuild/easyconfigs/f/FFmpeg/FFmpeg-0.10.16-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..3e71d0c50e397537dd12a800a5347be195714c09
--- /dev/null
+++ b/easybuild/easyconfigs/f/FFmpeg/FFmpeg-0.10.16-intel-2016a.eb
@@ -0,0 +1,32 @@
+easyblock = 'ConfigureMake'
+
+name = 'FFmpeg'
+version = '0.10.16'
+
+homepage = 'https://www.ffmpeg.org/'
+description = """A complete, cross-platform solution to record, convert and stream audio and video."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+# disable use of -xHOST, since it can trigger an internal compiler error in this case
+toolchainopts = {'optarch': False}
+
+sources = [SOURCELOWER_TAR_BZ2]
+source_urls = ['http://ffmpeg.org/releases/']
+
+dependencies = [
+    ('NASM', '2.11.08'),
+    ('zlib', '1.2.8'),
+    ('x264', '20160114'),
+]
+
+configopts = '--enable-pic --enable-shared --enable-gpl --enable-version3 --enable-nonfree --cc="$CC" --cxx="$CXX" '
+configopts += '--enable-libx264'
+
+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',
+                                                'swresample', 'swscale', 'avutil'] for y in ['so', 'a']],
+    'dirs': ['include']
+}
+
+moduleclass = 'vis'
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
similarity index 93%
rename from easybuild/easyconfigs/f/ffmpeg/ffmpeg-2.4-intel-2014.06.eb
rename to easybuild/easyconfigs/f/FFmpeg/FFmpeg-2.4-intel-2014.06.eb
index 4abf658ad6540653f653205149455b0c4f108c35..d1a07765f358829e3d1dcffb86291ce269eeb4d0 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
@@ -1,6 +1,6 @@
 easyblock = 'ConfigureMake'
 
-name = 'ffmpeg'
+name = 'FFmpeg'
 version = '2.4'
 
 homepage = 'https://www.ffmpeg.org/'
@@ -8,7 +8,7 @@ description = """A complete, cross-platform solution to record, convert and stre
 
 toolchain = {'name': 'intel', 'version': '2014.06'}
 
-sources = [SOURCE_TAR_BZ2]
+sources = [SOURCELOWER_TAR_BZ2]
 source_urls = ['http://ffmpeg.org/releases/']
 
 configopts = '--enable-pic --enable-shared --enable-gpl --enable-version3 --enable-nonfree --cc="$CC" --cxx="$CXX"'
@@ -19,7 +19,7 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files': ['bin/ff%s' % x for x in ['mpeg', 'probe', 'server'] ] +
+    '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',
                                                 '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
similarity index 93%
rename from easybuild/easyconfigs/f/ffmpeg/ffmpeg-2.4-intel-2014b.eb
rename to easybuild/easyconfigs/f/FFmpeg/FFmpeg-2.4-intel-2014b.eb
index 4461759fe7e4189bb9d6acb12ac1fa3b73c83fd6..2576f9f0ad3c910704c8f8655af24866876d5d25 100644
--- a/easybuild/easyconfigs/f/ffmpeg/ffmpeg-2.4-intel-2014b.eb
+++ b/easybuild/easyconfigs/f/FFmpeg/FFmpeg-2.4-intel-2014b.eb
@@ -1,6 +1,6 @@
 easyblock = 'ConfigureMake'
 
-name = 'ffmpeg'
+name = 'FFmpeg'
 version = '2.4'
 
 homepage = 'https://www.ffmpeg.org/'
@@ -8,7 +8,7 @@ description = """A complete, cross-platform solution to record, convert and stre
 
 toolchain = {'name': 'intel', 'version': '2014b'}
 
-sources = [SOURCE_TAR_BZ2]
+sources = [SOURCELOWER_TAR_BZ2]
 source_urls = ['http://ffmpeg.org/releases/']
 
 configopts = '--enable-pic --enable-shared --enable-gpl --enable-version3 --enable-nonfree --cc="$CC" --cxx="$CXX"'
@@ -19,7 +19,7 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files': ['bin/ff%s' % x for x in ['mpeg', 'probe', 'server'] ] +
+    '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',
                                                 'swresample', 'swscale', 'avutil'] for y in ['so', 'a']],
     'dirs': ['include']
diff --git a/easybuild/easyconfigs/f/FFmpeg/FFmpeg-2.4-intel-2015a.eb b/easybuild/easyconfigs/f/FFmpeg/FFmpeg-2.4-intel-2015a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..2a1ef9245eb885ff59e355395c97084dd41dd8cf
--- /dev/null
+++ b/easybuild/easyconfigs/f/FFmpeg/FFmpeg-2.4-intel-2015a.eb
@@ -0,0 +1,28 @@
+easyblock = 'ConfigureMake'
+
+name = 'FFmpeg'
+version = '2.4'
+
+homepage = 'https://www.ffmpeg.org/'
+description = """A complete, cross-platform solution to record, convert and stream audio and video."""
+
+toolchain = {'name': 'intel', 'version': '2015a'}
+
+sources = [SOURCELOWER_TAR_BZ2]
+source_urls = ['http://ffmpeg.org/releases/']
+
+configopts = '--enable-pic --enable-shared --enable-gpl --enable-version3 --enable-nonfree --cc="$CC" --cxx="$CXX"'
+
+dependencies = [
+    ('NASM', '2.11.05'),
+    ('zlib', '1.2.8'),
+]
+
+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',
+                                                'swresample', 'swscale', 'avutil'] for y in ['so', 'a']],
+    'dirs': ['include']
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/f/ffmpeg/ffmpeg-2.8-intel-2015b.eb b/easybuild/easyconfigs/f/FFmpeg/FFmpeg-2.8-intel-2015b.eb
similarity index 94%
rename from easybuild/easyconfigs/f/ffmpeg/ffmpeg-2.8-intel-2015b.eb
rename to easybuild/easyconfigs/f/FFmpeg/FFmpeg-2.8-intel-2015b.eb
index 9493af88c92449efa6d816314b14ac1b9c5a3242..e5bfa0bfd3b4216bd734b7c809b1c2e1a65e4279 100644
--- a/easybuild/easyconfigs/f/ffmpeg/ffmpeg-2.8-intel-2015b.eb
+++ b/easybuild/easyconfigs/f/FFmpeg/FFmpeg-2.8-intel-2015b.eb
@@ -1,6 +1,6 @@
 easyblock = 'ConfigureMake'
 
-name = 'ffmpeg'
+name = 'FFmpeg'
 version = '2.8'
 
 homepage = 'https://www.ffmpeg.org/'
@@ -8,7 +8,7 @@ description = """A complete, cross-platform solution to record, convert and stre
 
 toolchain = {'name': 'intel', 'version': '2015b'}
 
-sources = [SOURCE_TAR_BZ2]
+sources = [SOURCELOWER_TAR_BZ2]
 source_urls = ['http://ffmpeg.org/releases/']
 
 dependencies = [
@@ -21,7 +21,7 @@ configopts = '--enable-pic --enable-shared --enable-gpl --enable-version3 --enab
 configopts += '--enable-libx264'
 
 sanity_check_paths = {
-    'files': ['bin/ff%s' % x for x in ['mpeg', 'probe', 'server'] ] +
+    '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',
                                                 'swresample', 'swscale', 'avutil'] for y in ['so', 'a']],
     'dirs': ['include']
diff --git a/easybuild/easyconfigs/f/FFmpeg/FFmpeg-2.8.4-foss-2015a.eb b/easybuild/easyconfigs/f/FFmpeg/FFmpeg-2.8.4-foss-2015a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..ecba492e06bf95118c1196be806f6195c2602f34
--- /dev/null
+++ b/easybuild/easyconfigs/f/FFmpeg/FFmpeg-2.8.4-foss-2015a.eb
@@ -0,0 +1,30 @@
+easyblock = 'ConfigureMake'
+
+name = 'FFmpeg'
+version = '2.8.4'
+
+homepage = 'https://www.ffmpeg.org/'
+description = """A complete, cross-platform solution to record, convert and stream audio and video."""
+
+toolchain = {'name': 'foss', 'version': '2015a'}
+
+sources = [SOURCELOWER_TAR_BZ2]
+source_urls = ['http://ffmpeg.org/releases/']
+
+dependencies = [
+    ('NASM', '2.11.08'),
+    ('zlib', '1.2.8'),
+    ('x264', '20160114'),
+]
+
+configopts = '--enable-pic --enable-shared --enable-gpl --enable-version3 --enable-nonfree --cc="$CC" --cxx="$CXX" '
+configopts += '--enable-libx264'
+
+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',
+                                                'swresample', 'swscale', 'avutil'] for y in ['so', 'a']],
+    'dirs': ['include']
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/f/FFmpeg/FFmpeg-2.8.5-foss-2015a.eb b/easybuild/easyconfigs/f/FFmpeg/FFmpeg-2.8.5-foss-2015a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..3b5612efcec17969a793569d1b291bec0999c431
--- /dev/null
+++ b/easybuild/easyconfigs/f/FFmpeg/FFmpeg-2.8.5-foss-2015a.eb
@@ -0,0 +1,30 @@
+easyblock = 'ConfigureMake'
+
+name = 'FFmpeg'
+version = '2.8.5'
+
+homepage = 'https://www.ffmpeg.org/'
+description = """A complete, cross-platform solution to record, convert and stream audio and video."""
+
+toolchain = {'name': 'foss', 'version': '2015a'}
+
+sources = [SOURCELOWER_TAR_BZ2]
+source_urls = ['http://ffmpeg.org/releases/']
+
+dependencies = [
+    ('NASM', '2.11.08'),
+    ('zlib', '1.2.8'),
+    ('x264', '20160114'),
+]
+
+configopts = '--enable-pic --enable-shared --enable-gpl --enable-version3 --enable-nonfree --cc="$CC" --cxx="$CXX" '
+configopts += '--enable-libx264'
+
+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',
+                                                'swresample', 'swscale', 'avutil'] for y in ['so', 'a']],
+    'dirs': ['include']
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/f/FFmpeg/FFmpeg-2.8.6-intel-2016a.eb b/easybuild/easyconfigs/f/FFmpeg/FFmpeg-2.8.6-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..40be8fe314c14e52eef4182c3fc91ac890a1a076
--- /dev/null
+++ b/easybuild/easyconfigs/f/FFmpeg/FFmpeg-2.8.6-intel-2016a.eb
@@ -0,0 +1,30 @@
+easyblock = 'ConfigureMake'
+
+name = 'FFmpeg'
+version = '2.8.6'
+
+homepage = 'https://www.ffmpeg.org/'
+description = """A complete, cross-platform solution to record, convert and stream audio and video."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+sources = [SOURCELOWER_TAR_BZ2]
+source_urls = ['http://ffmpeg.org/releases/']
+
+dependencies = [
+    ('NASM', '2.11.08'),
+    ('zlib', '1.2.8'),
+    ('x264', '20160114'),
+]
+
+configopts = '--enable-pic --enable-shared --enable-gpl --enable-version3 --enable-nonfree --cc="$CC" --cxx="$CXX" '
+configopts += '--enable-libx264'
+
+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',
+                                                'swresample', 'swscale', 'avutil'] for y in ['so', 'a']],
+    'dirs': ['include']
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/f/FIAT/FIAT-1.1-ictce-5.2.0-Python-2.7.3.eb b/easybuild/easyconfigs/f/FIAT/FIAT-1.1-ictce-5.2.0-Python-2.7.3.eb
index 38a7cbfbd8d8d301fac7a987e1e588bbc71a8a43..7333fc753b6f7d049cc7cca7240ed5c58135863f 100644
--- a/easybuild/easyconfigs/f/FIAT/FIAT-1.1-ictce-5.2.0-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/f/FIAT/FIAT-1.1-ictce-5.2.0-Python-2.7.3.eb
@@ -10,7 +10,9 @@ arbitrary order instances of Jacobi-type quadrature rules on the same element sh
 
 toolchain = {'name': 'ictce', 'version': '5.2.0'}
 
-source_urls = ['https://launchpad.net/%(namelower)s/%(version_major_minor)s.x/release-%(version_major_minor)s/+download/']
+source_urls = [
+    'https://launchpad.net/%(namelower)s/%(version_major_minor)s.x/release-%(version_major_minor)s/+download/',
+]
 sources = [SOURCELOWER_TAR_GZ]
 
 python = "Python"
diff --git a/easybuild/easyconfigs/f/FIAT/FIAT-1.1-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/f/FIAT/FIAT-1.1-ictce-5.3.0-Python-2.7.3.eb
index c1e3ad55f7351f41e264b21ce8c1917c4038d846..b09c96da468abeb8421bec62a706a61386661a12 100644
--- a/easybuild/easyconfigs/f/FIAT/FIAT-1.1-ictce-5.3.0-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/f/FIAT/FIAT-1.1-ictce-5.3.0-Python-2.7.3.eb
@@ -10,7 +10,9 @@ arbitrary order instances of Jacobi-type quadrature rules on the same element sh
 
 toolchain = {'name': 'ictce', 'version': '5.3.0'}
 
-source_urls = ['https://launchpad.net/%(namelower)s/%(version_major_minor)s.x/release-%(version_major_minor)s/+download/']
+source_urls = [
+    'https://launchpad.net/%(namelower)s/%(version_major_minor)s.x/release-%(version_major_minor)s/+download/',
+]
 sources = [SOURCELOWER_TAR_GZ]
 
 python = "Python"
diff --git a/easybuild/easyconfigs/f/FIAT/FIAT-1.1-intel-2014b-Python-2.7.8.eb b/easybuild/easyconfigs/f/FIAT/FIAT-1.1-intel-2014b-Python-2.7.8.eb
index 1d1b0eda5c987b4b9982fddde90146090f5a526d..8515a18e690f4c257a53837d82b8c3ef49c10f84 100644
--- a/easybuild/easyconfigs/f/FIAT/FIAT-1.1-intel-2014b-Python-2.7.8.eb
+++ b/easybuild/easyconfigs/f/FIAT/FIAT-1.1-intel-2014b-Python-2.7.8.eb
@@ -10,7 +10,9 @@ arbitrary order instances of Jacobi-type quadrature rules on the same element sh
 
 toolchain = {'name': 'intel', 'version': '2014b'}
 
-source_urls = ['https://launchpad.net/%(namelower)s/%(version_major_minor)s.x/release-%(version_major_minor)s/+download/']
+source_urls = [
+    'https://launchpad.net/%(namelower)s/%(version_major_minor)s.x/release-%(version_major_minor)s/+download/',
+]
 sources = [SOURCELOWER_TAR_GZ]
 
 python = "Python"
diff --git a/easybuild/easyconfigs/f/FLTK/FLTK-1.3.2-foss-2014b.eb b/easybuild/easyconfigs/f/FLTK/FLTK-1.3.2-foss-2014b.eb
index 0bc1badf5f7aa41a88cb5baa7d528f5f340e1bc2..5a7bfc53c3d04e7a13eb74b87b82931820a58c1e 100644
--- a/easybuild/easyconfigs/f/FLTK/FLTK-1.3.2-foss-2014b.eb
+++ b/easybuild/easyconfigs/f/FLTK/FLTK-1.3.2-foss-2014b.eb
@@ -23,7 +23,7 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files': ['bin/fltk-config','bin/fluid'],
+    'files': ['bin/fltk-config', 'bin/fluid'],
     'dirs': ['lib'],
 }
 
diff --git a/easybuild/easyconfigs/f/FLTK/FLTK-1.3.2-goolf-1.4.10.eb b/easybuild/easyconfigs/f/FLTK/FLTK-1.3.2-goolf-1.4.10.eb
index 9b7f1917c4afd27ba99d7f7b80169dd3ff53ceec..89182262213ea5ef414e2cc7e5bea16a55ea61f0 100644
--- a/easybuild/easyconfigs/f/FLTK/FLTK-1.3.2-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/f/FLTK/FLTK-1.3.2-goolf-1.4.10.eb
@@ -11,7 +11,7 @@ description = """FLTK is a cross-platform C++ GUI toolkit for UNIX/Linux (X11),
  and MacOS X. FLTK provides modern GUI functionality without the bloat and supports 3D graphics via OpenGL
  and its built-in GLUT emulation."""
 
-toolchain = {'name': 'goolf' , 'version': '1.4.10'}
+toolchain = {'name': 'goolf', 'version': '1.4.10'}
 
 sources = ['%(namelower)s-%(version)s-source.tar.gz']
 source_urls = ['http://fltk.org/pub/%(namelower)s/%(version)s/']
@@ -22,7 +22,7 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files': ['bin/fltk-config','bin/fluid'],
+    'files': ['bin/fltk-config', 'bin/fluid'],
     'dirs': ['lib'],
 }
 
diff --git a/easybuild/easyconfigs/f/FLTK/FLTK-1.3.2-ictce-5.3.0.eb b/easybuild/easyconfigs/f/FLTK/FLTK-1.3.2-ictce-5.3.0.eb
index 11bcbb2f83f28edd4fee5bd3b50522c48d4d14a6..cdb8c7911115b6da2488e08010c51ced11e62eb2 100644
--- a/easybuild/easyconfigs/f/FLTK/FLTK-1.3.2-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/f/FLTK/FLTK-1.3.2-ictce-5.3.0.eb
@@ -22,7 +22,7 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files': ['bin/fltk-config','bin/fluid'],
+    'files': ['bin/fltk-config', 'bin/fluid'],
     'dirs': ['lib'],
 }
 
diff --git a/easybuild/easyconfigs/f/FLTK/FLTK-1.3.2-intel-2014b.eb b/easybuild/easyconfigs/f/FLTK/FLTK-1.3.2-intel-2014b.eb
index 5bc592de5f90db2a73682bc60e9cc7afbcb2da10..a70eaf387109e2394e29357f0096a753e7af6fc1 100644
--- a/easybuild/easyconfigs/f/FLTK/FLTK-1.3.2-intel-2014b.eb
+++ b/easybuild/easyconfigs/f/FLTK/FLTK-1.3.2-intel-2014b.eb
@@ -23,7 +23,7 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files': ['bin/fltk-config','bin/fluid'],
+    'files': ['bin/fltk-config', 'bin/fluid'],
     'dirs': ['lib'],
 }
 
diff --git a/easybuild/easyconfigs/f/FSL/FSL-4.1.9-ictce-4.0.6.eb b/easybuild/easyconfigs/f/FSL/FSL-4.1.9-ictce-4.0.6.eb
index f58cfc0a32b4a148b5d0a1de30f661fb910fa42c..087f9525efab34bdd797786e96aff45c7c77adce 100644
--- a/easybuild/easyconfigs/f/FSL/FSL-4.1.9-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/f/FSL/FSL-4.1.9-ictce-4.0.6.eb
@@ -10,9 +10,9 @@ source_urls = ["http://www.fmrib.ox.ac.uk/fsldownloads/"]
 sources = ['%s-%s-sources.tar.gz' % (name.lower(), version)]
 
 patches = [
-           'FSL_makefile_fixes.patch',
-           'FSL_icc_nan-inf_fix.patch'
-          ]
+    'FSL_makefile_fixes.patch',
+    'FSL_icc_nan-inf_fix.patch'
+]
 
 # libX11-devel is required for X11/Xlib.h, required by tk build
 osdependencies = ['libX11-devel']
diff --git a/easybuild/easyconfigs/f/FSL/FSL-4.1.9-ictce-5.3.0.eb b/easybuild/easyconfigs/f/FSL/FSL-4.1.9-ictce-5.3.0.eb
index e20f5d2a083b5098fa089ad21b3f81ed0ef69744..af52a65745684f1a3ccf7df58122d9c4267d64bf 100644
--- a/easybuild/easyconfigs/f/FSL/FSL-4.1.9-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/f/FSL/FSL-4.1.9-ictce-5.3.0.eb
@@ -10,9 +10,9 @@ source_urls = ["http://www.fmrib.ox.ac.uk/fsldownloads/"]
 sources = ['%s-%s-sources.tar.gz' % (name.lower(), version)]
 
 patches = [
-           'FSL_makefile_fixes.patch',
-           'FSL_icc_nan-inf_fix.patch'
-          ]
+    'FSL_makefile_fixes.patch',
+    'FSL_icc_nan-inf_fix.patch'
+]
 
 # libX11-devel is required for X11/Xlib.h, required by tk build
 osdependencies = ['libX11-devel']
diff --git a/easybuild/easyconfigs/f/FastQC/FastQC-0.10.1-goolf-1.4.10.eb b/easybuild/easyconfigs/f/FastQC/FastQC-0.10.1-goolf-1.4.10.eb
index 41209b695a0bdca4bf6e37e27f3b06957650cd3d..4bf3f06a01c7f2354475e33278012988fdedfe70 100644
--- a/easybuild/easyconfigs/f/FastQC/FastQC-0.10.1-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/f/FastQC/FastQC-0.10.1-goolf-1.4.10.eb
@@ -31,7 +31,7 @@ install_cmd = "cp -a FastQC/* %(installdir)s && chmod +x %(installdir)s/fastqc"
 
 sanity_check_paths = {
     'files': ["fastqc", "fastqc_icon.ico", "INSTALL.txt", "jbzip2-0.9.jar", "LICENSE.txt",
-                "README.txt", "RELEASE_NOTES.txt", "run_fastqc.bat", "sam-1.32.jar"],
+              "README.txt", "RELEASE_NOTES.txt", "run_fastqc.bat", "sam-1.32.jar"],
     'dirs': ["Contaminants", "Help", "Templates", "uk"],
 }
 
diff --git a/easybuild/easyconfigs/f/FreeXL/FreeXL-1.0.0g-goolf-1.5.14.eb b/easybuild/easyconfigs/f/FreeXL/FreeXL-1.0.0g-goolf-1.5.14.eb
new file mode 100644
index 0000000000000000000000000000000000000000..69c610cd3fa824ca2232f9fbe5e9c8de682c8bc3
--- /dev/null
+++ b/easybuild/easyconfigs/f/FreeXL/FreeXL-1.0.0g-goolf-1.5.14.eb
@@ -0,0 +1,22 @@
+name = 'FreeXL'
+version = '1.0.0g'
+
+easyblock = 'ConfigureMake'
+
+homepage = "https://www.gaia-gis.it/fossil/freexl/index"
+description = "FreeXL is an open source library to extract valid data from within an Excel (.xls) spreadsheet."
+
+toolchain = {'name': 'goolf', 'version': '1.5.14'}
+toolchainopts = {'usempi': False, 'pic': True}
+
+source_urls = ['http://www.gaia-gis.it/gaia-sins/freexl-sources/']
+sources = [SOURCELOWER_TAR_GZ]
+
+builddependencies = [('CMake', '2.8.10.2')]
+
+sanity_check_paths = {
+    'files': ["lib/libfreexl.la"],
+    'dirs': ["lib"]
+    }
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/f/FreeXL/FreeXL-1.0.1-intel-2015a.eb b/easybuild/easyconfigs/f/FreeXL/FreeXL-1.0.1-intel-2015a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..0401395acc9e127fe0a882ff939979886d06b220
--- /dev/null
+++ b/easybuild/easyconfigs/f/FreeXL/FreeXL-1.0.1-intel-2015a.eb
@@ -0,0 +1,22 @@
+name = 'FreeXL'
+version = '1.0.1'
+
+easyblock = 'ConfigureMake'
+
+homepage = "https://www.gaia-gis.it/fossil/freexl/index"
+description = "FreeXL is an open source library to extract valid data from within an Excel (.xls) spreadsheet."
+
+toolchain = {'name': 'intel', 'version': '2015a'}
+toolchainopts = {'usempi': False, 'pic': True}
+
+source_urls = ['http://www.gaia-gis.it/gaia-sins/freexl-sources/']
+sources = [SOURCELOWER_TAR_GZ]
+
+builddependencies = [('CMake', '3.2.2')]
+
+sanity_check_paths = {
+    'files': ["lib/libfreexl.la"],
+    'dirs': ["lib"]
+    }
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/f/FreeXL/FreeXL-1.0.2-foss-2015a.eb b/easybuild/easyconfigs/f/FreeXL/FreeXL-1.0.2-foss-2015a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..c38933ad4fa03ec8069dfc616171467f17ec934f
--- /dev/null
+++ b/easybuild/easyconfigs/f/FreeXL/FreeXL-1.0.2-foss-2015a.eb
@@ -0,0 +1,22 @@
+name = 'FreeXL'
+version = '1.0.2'
+
+easyblock = 'ConfigureMake'
+
+homepage = "https://www.gaia-gis.it/fossil/freexl/index"
+description = "FreeXL is an open source library to extract valid data from within an Excel (.xls) spreadsheet."
+
+toolchain = {'name': 'foss', 'version': '2015a'}
+toolchainopts = {'usempi': False, 'pic': True}
+
+source_urls = ['http://www.gaia-gis.it/gaia-sins/freexl-sources/']
+sources = [SOURCELOWER_TAR_GZ]
+
+builddependencies = [('CMake', '3.4.1')]
+
+sanity_check_paths = {
+    'files': ["lib/libfreexl.la"],
+    'dirs': ["lib"]
+    }
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/f/fastqc/fastqc-0.11.4.eb b/easybuild/easyconfigs/f/fastqc/fastqc-0.11.4.eb
new file mode 100644
index 0000000000000000000000000000000000000000..a4d75eb501de26f23f1b9e9442e1a83c20f55680
--- /dev/null
+++ b/easybuild/easyconfigs/f/fastqc/fastqc-0.11.4.eb
@@ -0,0 +1,27 @@
+easyblock = 'EB_Java'
+
+name = 'fastqc'
+version = '0.11.4'
+
+homepage = 'http://www.bioinformatics.babraham.ac.uk/projects/fastqc/'
+description = """A set of tools (in Java) for working with next generation sequencing data in the BAM format."""
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+source_urls = ['http://www.bioinformatics.babraham.ac.uk/projects/fastqc/']
+sources = ['%(name)s_v%(version)s.zip']
+
+dependencies = [('Java', '1.7.0_80')]
+
+postinstallcmds = ["chmod -R a+rx %(installdir)s/fastqc %(installdir)s/run_fastqc.bat"]
+
+modextrapaths = {'PATH': ['']}
+
+sanity_check_paths = {
+    'files': ['fastqc'],
+    'dirs': [],
+}
+
+sanity_check_commands = [('fastqc', '-v')]
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/f/flex/flex-2.5.35-ictce-5.4.0.eb b/easybuild/easyconfigs/f/flex/flex-2.5.35-ictce-5.4.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..653b53ec920c4e03619928a4db3ae72567fd30d6
--- /dev/null
+++ b/easybuild/easyconfigs/f/flex/flex-2.5.35-ictce-5.4.0.eb
@@ -0,0 +1,14 @@
+name = 'flex'
+version = '2.5.35'
+
+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': 'ictce', 'version': '5.4.0'}
+toolchainopts = {'pic': True}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://prdownloads.sourceforge.net/%(namelower)s']
+
+moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/f/flex/flex-2.5.39-GCC-4.9.2-binutils-2.25.eb b/easybuild/easyconfigs/f/flex/flex-2.5.39-GCC-4.9.2-binutils-2.25.eb
index 55d2930dcc34a5adb9aae19ef18f51b5eae20753..98e5ff55276e13009f98c7b0bc1de298dae26f1b 100644
--- a/easybuild/easyconfigs/f/flex/flex-2.5.39-GCC-4.9.2-binutils-2.25.eb
+++ b/easybuild/easyconfigs/f/flex/flex-2.5.39-GCC-4.9.2-binutils-2.25.eb
@@ -1,5 +1,3 @@
-easyblock = 'ConfigureMake'
-
 name = 'flex'
 version = '2.5.39'
 
diff --git a/easybuild/easyconfigs/f/flex/flex-2.5.39-GCC-4.9.2.eb b/easybuild/easyconfigs/f/flex/flex-2.5.39-GCC-4.9.2.eb
index 9b7e0571f2da77cea633a99219f9e72c49153bfa..1c15e90f19802698bd652fedb19559f92f98f91a 100644
--- a/easybuild/easyconfigs/f/flex/flex-2.5.39-GCC-4.9.2.eb
+++ b/easybuild/easyconfigs/f/flex/flex-2.5.39-GCC-4.9.2.eb
@@ -1,5 +1,3 @@
-easyblock = 'ConfigureMake'
-
 name = 'flex'
 version = '2.5.39'
 
diff --git a/easybuild/easyconfigs/f/flex/flex-2.5.39-GCC-4.9.3-binutils-2.25.eb b/easybuild/easyconfigs/f/flex/flex-2.5.39-GCC-4.9.3-binutils-2.25.eb
index 1d773d362f673d72cd7dc3bf21fd5bb0fc09b54b..667f205b6954315caf061213eac9a4b997c25c0b 100644
--- a/easybuild/easyconfigs/f/flex/flex-2.5.39-GCC-4.9.3-binutils-2.25.eb
+++ b/easybuild/easyconfigs/f/flex/flex-2.5.39-GCC-4.9.3-binutils-2.25.eb
@@ -1,5 +1,3 @@
-easyblock = 'ConfigureMake'
-
 name = 'flex'
 version = '2.5.39'
 
diff --git a/easybuild/easyconfigs/f/flex/flex-2.5.39-GCC-4.9.3.eb b/easybuild/easyconfigs/f/flex/flex-2.5.39-GCC-4.9.3.eb
index 4b714067507554e5d69499ae45e2320dd752ebf1..034599b7bc3de6886532e66e3a52affef9b6bfe7 100644
--- a/easybuild/easyconfigs/f/flex/flex-2.5.39-GCC-4.9.3.eb
+++ b/easybuild/easyconfigs/f/flex/flex-2.5.39-GCC-4.9.3.eb
@@ -1,5 +1,3 @@
-easyblock = 'ConfigureMake'
-
 name = 'flex'
 version = '2.5.39'
 
diff --git a/easybuild/easyconfigs/f/flex/flex-2.5.39-GCC-5.1.0-binutils-2.25.eb b/easybuild/easyconfigs/f/flex/flex-2.5.39-GCC-5.1.0-binutils-2.25.eb
index b6406b3fee3e4248c7dc45bd1ed5628d8a758725..75d18ede78430340ae8f7496931339f6e688b5f6 100644
--- a/easybuild/easyconfigs/f/flex/flex-2.5.39-GCC-5.1.0-binutils-2.25.eb
+++ b/easybuild/easyconfigs/f/flex/flex-2.5.39-GCC-5.1.0-binutils-2.25.eb
@@ -1,5 +1,3 @@
-easyblock = 'ConfigureMake'
-
 name = 'flex'
 version = '2.5.39'
 
diff --git a/easybuild/easyconfigs/f/flex/flex-2.5.39-GCCcore-4.9.3.eb b/easybuild/easyconfigs/f/flex/flex-2.5.39-GCCcore-4.9.3.eb
index ecfc6d2f7e68e915391183241f9b9047b694ba33..bd9f2b71e7df2fca1cb02cd29fae60e4fc95f066 100644
--- a/easybuild/easyconfigs/f/flex/flex-2.5.39-GCCcore-4.9.3.eb
+++ b/easybuild/easyconfigs/f/flex/flex-2.5.39-GCCcore-4.9.3.eb
@@ -1,5 +1,3 @@
-easyblock = 'ConfigureMake'
-
 name = 'flex'
 version = '2.5.39'
 
diff --git a/easybuild/easyconfigs/f/flex/flex-2.5.39-GNU-4.9.3-2.25.eb b/easybuild/easyconfigs/f/flex/flex-2.5.39-GNU-4.9.3-2.25.eb
index 7c5e4528e08f09aacf2307715227d82f66ec7da5..3b653b0adc02af1583620de8c7e2890692646f32 100644
--- a/easybuild/easyconfigs/f/flex/flex-2.5.39-GNU-4.9.3-2.25.eb
+++ b/easybuild/easyconfigs/f/flex/flex-2.5.39-GNU-4.9.3-2.25.eb
@@ -1,5 +1,3 @@
-easyblock = 'ConfigureMake'
-
 name = 'flex'
 version = '2.5.39'
 
diff --git a/easybuild/easyconfigs/f/flex/flex-2.6.0-GCC-4.9.2.eb b/easybuild/easyconfigs/f/flex/flex-2.6.0-GCC-4.9.2.eb
new file mode 100644
index 0000000000000000000000000000000000000000..3626cfd2399a402a902c8c3729d6b01632c4b2e8
--- /dev/null
+++ b/easybuild/easyconfigs/f/flex/flex-2.6.0-GCC-4.9.2.eb
@@ -0,0 +1,16 @@
+name = 'flex'
+version = '2.6.0'
+
+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': 'GCC', 'version': '4.9.2'}
+toolchainopts = {'pic': True}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://prdownloads.sourceforge.net/%(namelower)s']
+
+dependencies = [('Bison', '3.0.4')]
+
+moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/f/flex/flex-2.6.0-foss-2015a.eb b/easybuild/easyconfigs/f/flex/flex-2.6.0-foss-2015a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..bd783441d3334e3add6192d730197dc1c0c64441
--- /dev/null
+++ b/easybuild/easyconfigs/f/flex/flex-2.6.0-foss-2015a.eb
@@ -0,0 +1,16 @@
+name = 'flex'
+version = '2.6.0'
+
+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': 'foss', 'version': '2015a'}
+toolchainopts = {'pic': True}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://prdownloads.sourceforge.net/%(namelower)s']
+
+dependencies = [('Bison', '3.0.4')]
+
+moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/f/fontconfig/fontconfig-2.11.1-foss-2014b.eb b/easybuild/easyconfigs/f/fontconfig/fontconfig-2.11.1-foss-2014b.eb
index 4cd5e51c8c12c38e5035df12bc9aae0af6388597..c1ab6dd32ff0e8f8ce30d6f0535f26f5223d22b0 100644
--- a/easybuild/easyconfigs/f/fontconfig/fontconfig-2.11.1-foss-2014b.eb
+++ b/easybuild/easyconfigs/f/fontconfig/fontconfig-2.11.1-foss-2014b.eb
@@ -14,7 +14,7 @@ sources = [SOURCE_TAR_GZ]
 
 dependencies = [
     ('expat', '2.1.0'),
-    ('freetype','2.5.3'),
+    ('freetype', '2.5.3'),
 ]
 
 moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/f/fontconfig/fontconfig-2.11.1-goolf-1.7.20.eb b/easybuild/easyconfigs/f/fontconfig/fontconfig-2.11.1-goolf-1.7.20.eb
index e77da2e1fe8e9bdc91c4533bcc71cddafbadac5e..51c9c97afb67d3aefc327c47198bfb5399e4f15b 100644
--- a/easybuild/easyconfigs/f/fontconfig/fontconfig-2.11.1-goolf-1.7.20.eb
+++ b/easybuild/easyconfigs/f/fontconfig/fontconfig-2.11.1-goolf-1.7.20.eb
@@ -14,7 +14,7 @@ sources = [SOURCE_TAR_GZ]
 
 dependencies = [
     ('expat', '2.1.0'),
-    ('freetype','2.5.3'),
+    ('freetype', '2.5.3'),
 ]
 
 configopts = '--disable-docs '
diff --git a/easybuild/easyconfigs/f/fontconfig/fontconfig-2.11.1-intel-2014b.eb b/easybuild/easyconfigs/f/fontconfig/fontconfig-2.11.1-intel-2014b.eb
index 1d43a6c1f3b98621ae23421aa0a56486966b0f7f..0cbc9d12008d02c1ce12f8023330489194fbf3b6 100644
--- a/easybuild/easyconfigs/f/fontconfig/fontconfig-2.11.1-intel-2014b.eb
+++ b/easybuild/easyconfigs/f/fontconfig/fontconfig-2.11.1-intel-2014b.eb
@@ -14,7 +14,7 @@ sources = [SOURCE_TAR_GZ]
 
 dependencies = [
     ('expat', '2.1.0'),
-    ('freetype','2.5.3'),
+    ('freetype', '2.5.3'),
 ]
 
 configopts = '--disable-docs '
diff --git a/easybuild/easyconfigs/f/fontconfig/fontconfig-2.11.94-goolf-1.7.20.eb b/easybuild/easyconfigs/f/fontconfig/fontconfig-2.11.94-goolf-1.7.20.eb
index 8fdfa9a81b7a10270fc68987042f97919f5b5cbb..6e68a31103a99bb6470619a6b35ca64e271aa9ce 100644
--- a/easybuild/easyconfigs/f/fontconfig/fontconfig-2.11.94-goolf-1.7.20.eb
+++ b/easybuild/easyconfigs/f/fontconfig/fontconfig-2.11.94-goolf-1.7.20.eb
@@ -14,7 +14,7 @@ sources = [SOURCE_TAR_GZ]
 
 dependencies = [
     ('expat', '2.1.0'),
-    ('freetype','2.6'),
+    ('freetype', '2.6'),
 ]
 
 configopts = '--disable-docs '
diff --git a/easybuild/easyconfigs/f/fontconfig/fontconfig-2.11.94-intel-2016a.eb b/easybuild/easyconfigs/f/fontconfig/fontconfig-2.11.94-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..f008f4125b60fbaaae2b7aa97e274125c11f6778
--- /dev/null
+++ b/easybuild/easyconfigs/f/fontconfig/fontconfig-2.11.94-intel-2016a.eb
@@ -0,0 +1,22 @@
+easyblock = 'ConfigureMake'
+
+name = 'fontconfig'
+version = '2.11.94'
+
+homepage = 'http://www.freedesktop.org/software/fontconfig'
+description = """Fontconfig is a library designed to provide system-wide font configuration, customization and
+application access."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+source_urls = ['http://www.freedesktop.org/software/fontconfig/release/']
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [
+    ('expat', '2.1.0'),
+    ('freetype', '2.6.2'),
+]
+
+configopts = '--disable-docs '
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/f/fontsproto/fontsproto-2.1.3-intel-2015a.eb b/easybuild/easyconfigs/f/fontsproto/fontsproto-2.1.3-intel-2015a.eb
index 7e4853de2ffee65d77d188c357e45632056be381..6c5ce993873e7f5c7bc3475680d36e78c998aae5 100644
--- a/easybuild/easyconfigs/f/fontsproto/fontsproto-2.1.3-intel-2015a.eb
+++ b/easybuild/easyconfigs/f/fontsproto/fontsproto-2.1.3-intel-2015a.eb
@@ -13,8 +13,8 @@ sources = [SOURCE_TAR_GZ]
 source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
 
 sanity_check_paths = {
-    'files' : [],
-    'dirs' : ['include/X11/fonts'],
+    'files': [],
+    'dirs': ['include/X11/fonts'],
 }
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/f/fontsproto/fontsproto-2.1.3-intel-2015b.eb b/easybuild/easyconfigs/f/fontsproto/fontsproto-2.1.3-intel-2015b.eb
index 5c120f5dd2170d55a31b9bde7821e4b0df8523d4..5c83a62b97f110f575b7046df964205e3d44cd96 100644
--- a/easybuild/easyconfigs/f/fontsproto/fontsproto-2.1.3-intel-2015b.eb
+++ b/easybuild/easyconfigs/f/fontsproto/fontsproto-2.1.3-intel-2015b.eb
@@ -13,8 +13,8 @@ sources = [SOURCE_TAR_GZ]
 source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
 
 sanity_check_paths = {
-    'files' : [],
-    'dirs' : ['include/X11/fonts'],
+    'files': [],
+    'dirs': ['include/X11/fonts'],
 }
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/f/freetype/freetype-2.6.2-foss-2015a.eb b/easybuild/easyconfigs/f/freetype/freetype-2.6.2-foss-2015a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..32c4b9ab5ccd913fba135742d42e37c7e813dd7f
--- /dev/null
+++ b/easybuild/easyconfigs/f/freetype/freetype-2.6.2-foss-2015a.eb
@@ -0,0 +1,21 @@
+name = 'freetype'
+version = '2.6.2'
+
+homepage = 'http://freetype.org'
+description = """FreeType 2 is a software font engine that is designed to be small, efficient, highly customizable, and
+ portable while capable of producing high-quality output (glyph images). It can be used in graphics libraries, display
+ servers, font conversion tools, text image generation tools, and many other products as well."""
+
+toolchain = {'name': 'foss', 'version': '2015a'}
+
+source_urls = [GNU_SAVANNAH_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [('libpng', '1.6.20')]
+
+sanity_check_paths = {
+    'files': ['bin/freetype-config', 'lib/libfreetype.a', 'lib/libfreetype.%s' % SHLIB_EXT, 'lib/pkgconfig/freetype2.pc'],
+    'dirs': ['include/freetype2'],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/f/freetype/freetype-2.6.2-intel-2015b.eb b/easybuild/easyconfigs/f/freetype/freetype-2.6.2-intel-2015b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..0811253154166a1820d050035053515e24178a71
--- /dev/null
+++ b/easybuild/easyconfigs/f/freetype/freetype-2.6.2-intel-2015b.eb
@@ -0,0 +1,22 @@
+name = 'freetype'
+version = '2.6.2'
+
+homepage = 'http://freetype.org'
+description = """FreeType 2 is a software font engine that is designed to be small, efficient, highly customizable, and
+ portable while capable of producing high-quality output (glyph images). It can be used in graphics libraries, display
+ servers, font conversion tools, text image generation tools, and many other products as well."""
+
+toolchain = {'name': 'intel', 'version': '2015b'}
+
+source_urls = [GNU_SAVANNAH_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [('libpng', '1.6.21')]
+
+sanity_check_paths = {
+    'files': ['bin/freetype-config', 'lib/libfreetype.a', 'lib/libfreetype.%s' % SHLIB_EXT,
+              'lib/pkgconfig/freetype2.pc'],
+    'dirs': ['include/freetype2'],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/g/GATE/GATE-7.0-intel-2015a.eb b/easybuild/easyconfigs/g/GATE/GATE-7.0-intel-2015a.eb
index 55757f7ccc5a64c6f5f4ce611ac0a6f5dbc430d9..e93ce7917511e1e253587bed2307978509a36f74 100644
--- a/easybuild/easyconfigs/g/GATE/GATE-7.0-intel-2015a.eb
+++ b/easybuild/easyconfigs/g/GATE/GATE-7.0-intel-2015a.eb
@@ -8,7 +8,7 @@ description = """GATE is an advanced opensource software developed by the intern
 
 toolchain = {'name': 'intel', 'version': '2015a'}
 
-sources = [('%(namelower)s_v%(version)s.tar_.gz' , "tar xfvz %s")]
+sources = [('%(namelower)s_v%(version)s.tar_.gz', "tar xfvz %s")]
 source_urls = ['http://www.opengatecollaboration.org/sites/opengatecollaboration.org/files/']
 
 patches = [
diff --git a/easybuild/easyconfigs/g/GC3Pie/GC3Pie-2.2.3.eb b/easybuild/easyconfigs/g/GC3Pie/GC3Pie-2.2.3.eb
index 8bb06bd90a35aaeb7a12ba19b72e6356cbf63681..3b725d6c3c0e1437e95f65b23edbe8e231a195a2 100644
--- a/easybuild/easyconfigs/g/GC3Pie/GC3Pie-2.2.3.eb
+++ b/easybuild/easyconfigs/g/GC3Pie/GC3Pie-2.2.3.eb
@@ -100,8 +100,8 @@ modextrapaths = {'PYTHONPATH': ['lib/python%s/site-packages' % pyshortver, 'lib6
 full_sanity_check = True
 
 sanity_check_paths = {
-  'files': ['bin/gc3utils'],
-  'dirs': ['lib/python%(pyver)s/site-packages/gc3pie-%%(version)s-py%(pyver)s.egg/gc3libs' % {'pyver': pyshortver}],
+    'files': ['bin/gc3utils'],
+    'dirs': ['lib/python%(pyver)s/site-packages/gc3pie-%%(version)s-py%(pyver)s.egg/gc3libs' % {'pyver': pyshortver}],
 }
 
 sanity_check_commands = [('gc3utils', 'info --version')]
diff --git a/easybuild/easyconfigs/g/GC3Pie/GC3Pie-2.3.eb b/easybuild/easyconfigs/g/GC3Pie/GC3Pie-2.3.eb
index 6fee6c35e89d1154273ceb311f5dbea15c59d1a6..662fb134c28a876be1cd49172e1f53943cdf423c 100644
--- a/easybuild/easyconfigs/g/GC3Pie/GC3Pie-2.3.eb
+++ b/easybuild/easyconfigs/g/GC3Pie/GC3Pie-2.3.eb
@@ -101,9 +101,9 @@ full_sanity_check = True
 
 eggname = 'gc3pie-%%(version)s-py%s.egg' % pyver
 sanity_check_paths = {
-  'files': ['bin/gc3utils',
-            ('lib/python%s/site-packages/%s' % (pyver, eggname), 'lib64/python%s/site-packages/%s' % (pyver, eggname))],
-  'dirs': [],
+    'files': ['bin/gc3utils',
+              ('lib/python%s/site-packages/%s' % (pyver, eggname), 'lib64/python%s/site-packages/%s' % (pyver, eggname))],
+    'dirs': [],
 }
 
 sanity_check_commands = [('gc3utils', 'info --version')]
diff --git a/easybuild/easyconfigs/g/GC3Pie/GC3Pie-2.4.0.eb b/easybuild/easyconfigs/g/GC3Pie/GC3Pie-2.4.0.eb
index 8a1d9386f8ef8d4d2d480e4fec0bd2bcf8149847..b08b112eb7d5032d1720f3abefc858ed8f45dbef 100644
--- a/easybuild/easyconfigs/g/GC3Pie/GC3Pie-2.4.0.eb
+++ b/easybuild/easyconfigs/g/GC3Pie/GC3Pie-2.4.0.eb
@@ -101,9 +101,9 @@ full_sanity_check = True
 
 eggname = 'gc3pie-%%(version)s-py%s.egg' % pyver
 sanity_check_paths = {
-  'files': ['bin/gc3utils',
-            ('lib/python%s/site-packages/%s' % (pyver, eggname), 'lib64/python%s/site-packages/%s' % (pyver, eggname))],
-  'dirs': [],
+    'files': ['bin/gc3utils',
+              ('lib/python%s/site-packages/%s' % (pyver, eggname), 'lib64/python%s/site-packages/%s' % (pyver, eggname))],
+    'dirs': [],
 }
 
 sanity_check_commands = [('gc3utils', 'info --version')]
diff --git a/easybuild/easyconfigs/g/GC3Pie/GC3Pie-2.4.1.eb b/easybuild/easyconfigs/g/GC3Pie/GC3Pie-2.4.1.eb
index b62aa2387d6f8806ade0be67e3e1375fbc1476a4..92f6d885db252e11fa3d669838d30832eb0b7ce5 100644
--- a/easybuild/easyconfigs/g/GC3Pie/GC3Pie-2.4.1.eb
+++ b/easybuild/easyconfigs/g/GC3Pie/GC3Pie-2.4.1.eb
@@ -101,9 +101,9 @@ full_sanity_check = True
 
 eggname = 'gc3pie-%%(version)s-py%s.egg' % pyver
 sanity_check_paths = {
-  'files': ['bin/gc3utils',
-            ('lib/python%s/site-packages/%s' % (pyver, eggname), 'lib64/python%s/site-packages/%s' % (pyver, eggname))],
-  'dirs': [],
+    'files': ['bin/gc3utils',
+              ('lib/python%s/site-packages/%s' % (pyver, eggname), 'lib64/python%s/site-packages/%s' % (pyver, eggname))],
+    'dirs': [],
 }
 
 sanity_check_commands = [('gc3utils', 'info --version')]
diff --git a/easybuild/easyconfigs/g/GC3Pie/GC3Pie-2.4.2.eb b/easybuild/easyconfigs/g/GC3Pie/GC3Pie-2.4.2.eb
index e73e2257cc55e8b263e900b27ee5702259fc5d32..e5720c5610cff3f8dfcf833c52d6ffcb2f8e6541 100644
--- a/easybuild/easyconfigs/g/GC3Pie/GC3Pie-2.4.2.eb
+++ b/easybuild/easyconfigs/g/GC3Pie/GC3Pie-2.4.2.eb
@@ -101,9 +101,9 @@ full_sanity_check = True
 
 eggname = 'gc3pie-%%(version)s-py%s.egg' % pyver
 sanity_check_paths = {
-  'files': ['bin/gc3utils',
-            ('lib/python%s/site-packages/%s' % (pyver, eggname), 'lib64/python%s/site-packages/%s' % (pyver, eggname))],
-  'dirs': [],
+    'files': ['bin/gc3utils',
+              ('lib/python%s/site-packages/%s' % (pyver, eggname), 'lib64/python%s/site-packages/%s' % (pyver, eggname))],
+    'dirs': [],
 }
 
 sanity_check_commands = [('gc3utils', 'info --version')]
diff --git a/easybuild/easyconfigs/g/GCCcore/GCCcore-4.9.3.eb b/easybuild/easyconfigs/g/GCCcore/GCCcore-4.9.3.eb
index 2027c9fa8e29ce268acc07fd59ca6ff725817905..268b0526876636af0c7f5e6de8a2e6e7aba2f7d7 100644
--- a/easybuild/easyconfigs/g/GCCcore/GCCcore-4.9.3.eb
+++ b/easybuild/easyconfigs/g/GCCcore/GCCcore-4.9.3.eb
@@ -13,7 +13,7 @@ mpfr_version = '3.1.2'
 gcc_name = 'GCC'
 
 source_urls = [
-    'http://ftpmirror.gnu.org/%s/%s-%s' % (gcc_name.lower(), gcc_name.lower(), version),  # GCC auto-resolving HTTP mirror
+    'http://ftpmirror.gnu.org/gcc/gcc-%s' % version,  # GCC auto-resolving HTTP mirror
     'http://ftpmirror.gnu.org/gmp',  # idem for GMP
     'http://ftpmirror.gnu.org/mpfr',  # idem for MPFR
     'http://www.multiprecision.org/mpc/download',  # MPC official
diff --git a/easybuild/easyconfigs/g/GDAL/GDAL-1.9.2-ictce-4.1.13.eb b/easybuild/easyconfigs/g/GDAL/GDAL-1.9.2-ictce-4.1.13.eb
index 94cef6458ddc9d3ceeaa8176be553df9c0efe092..4eded30be6a354fb363274503f54d0935efb3c6f 100644
--- a/easybuild/easyconfigs/g/GDAL/GDAL-1.9.2-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/g/GDAL/GDAL-1.9.2-ictce-4.1.13.eb
@@ -8,7 +8,7 @@ description = """GDAL is a translator library for raster geospatial data formats
  Open Source license by the Open Source Geospatial Foundation. As a library, it presents a single abstract data model
  to the calling application for all supported formats. It also comes with a variety of useful commandline utilities for
  data translation and processing."""
-  
+
 toolchain = {'name': 'ictce', 'version': '4.1.13'}
 
 source_urls = ['http://download.osgeo.org/gdal/']
diff --git a/easybuild/easyconfigs/g/GDAL/GDAL-1.9.2-iqacml-3.7.3.eb b/easybuild/easyconfigs/g/GDAL/GDAL-1.9.2-iqacml-3.7.3.eb
index 83b2c99400a82c8c92840dfff39efcd1a51a65ad..670cd7dbd40f4247735b9fea28eef15d0a08ecec 100644
--- a/easybuild/easyconfigs/g/GDAL/GDAL-1.9.2-iqacml-3.7.3.eb
+++ b/easybuild/easyconfigs/g/GDAL/GDAL-1.9.2-iqacml-3.7.3.eb
@@ -8,7 +8,7 @@ description = """GDAL is a translator library for raster geospatial data formats
  Open Source license by the Open Source Geospatial Foundation. As a library, it presents a single abstract data model
  to the calling application for all supported formats. It also comes with a variety of useful commandline utilities for
  data translation and processing."""
-  
+
 toolchain = {'name': 'iqacml', 'version': '3.7.3'}
 
 source_urls = ['http://download.osgeo.org/gdal/']
diff --git a/easybuild/easyconfigs/g/GDAL/GDAL-2.0.1-foss-2015b.eb b/easybuild/easyconfigs/g/GDAL/GDAL-2.0.1-foss-2015b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..304e10cc995704146f2b4221e2637acef3fca39d
--- /dev/null
+++ b/easybuild/easyconfigs/g/GDAL/GDAL-2.0.1-foss-2015b.eb
@@ -0,0 +1,30 @@
+easyblock = 'ConfigureMake'
+
+name = 'GDAL'
+version = '2.0.1'
+
+homepage = 'http://www.gdal.org/'
+description = """GDAL is a translator library for raster geospatial data formats that is released under an X/MIT style
+ Open Source license by the Open Source Geospatial Foundation. As a library, it presents a single abstract data model
+ to the calling application for all supported formats. It also comes with a variety of useful commandline utilities for
+ data translation and processing."""
+
+toolchain = {'name': 'foss', 'version': '2015b'}
+toolchainopts = {'usempi': True}
+
+source_urls = ['http://download.osgeo.org/gdal/%(version)s/']
+sources = [SOURCELOWER_TAR_XZ]
+
+dependencies = [
+    ('netCDF', '4.3.3.1'),
+    ('expat', '2.1.0'),
+    ('libxml2', '2.9.2'),
+    ('zlib', '1.2.8'),
+]
+
+sanity_check_paths = {
+    'files': ['lib/libgdal.%s' % SHLIB_EXT, 'lib/libgdal.a'],
+    'dirs': ['bin', 'include']
+}
+
+moduleclass = 'data'
diff --git a/easybuild/easyconfigs/g/GDB/GDB-7.10.1-intel-2016a-Python-2.7.11.eb b/easybuild/easyconfigs/g/GDB/GDB-7.10.1-intel-2016a-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..88be8d913f1effbde3afe4ca0bc2ba88d0f7a8b3
--- /dev/null
+++ b/easybuild/easyconfigs/g/GDB/GDB-7.10.1-intel-2016a-Python-2.7.11.eb
@@ -0,0 +1,31 @@
+easyblock = 'ConfigureMake'
+
+name = 'GDB'
+version = '7.10.1'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'http://www.gnu.org/software/gdb/gdb.html'
+description = "The GNU Project Debugger"
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+sources = [SOURCELOWER_TAR_XZ]
+source_urls = [GNU_SOURCE]
+
+patches = ['GDB-7.9-missing-makeinfo.patch']
+
+dependencies = [
+    ('ncurses', '6.0'),
+    ('Python', '2.7.11'),
+]
+
+configopts = '--with-python'
+
+parallel = 1
+
+sanity_check_paths = {
+    'files': ['bin/gdb', 'bin/gdbserver'],
+    'dirs': [],
+}
+
+moduleclass = 'debugger'
diff --git a/easybuild/easyconfigs/g/GEM-library/GEM-library-20130406-045632_pre-release-3_Linux-x86_64.eb b/easybuild/easyconfigs/g/GEM-library/GEM-library-20130406-045632_pre-release-3_Linux-x86_64.eb
index 9dd671125bc21403a884c6063f8c94b99c97a27a..009df93cd714adaefba937bf406efc33c949d30e 100644
--- a/easybuild/easyconfigs/g/GEM-library/GEM-library-20130406-045632_pre-release-3_Linux-x86_64.eb
+++ b/easybuild/easyconfigs/g/GEM-library/GEM-library-20130406-045632_pre-release-3_Linux-x86_64.eb
@@ -35,7 +35,7 @@ skipsteps = ['build']
 # glob support in MakeCp easyblock is required so EasyBuild-1.12 or higher is required
 easybuild_version = '1.12.0'
 
-files_to_copy = [ (["man/*"], 'man/man1/'), "bin" ]
+files_to_copy = [(["man/*"], 'man/man1/'), "bin"]
 
 sanity_check_paths = {
     'files': ["bin/gem-indexer", "bin/gem-mapper", "bin/gem-rna-mapper"],
diff --git a/easybuild/easyconfigs/g/GEOS/GEOS-3.5.0-foss-2015a-Python-2.7.11.eb b/easybuild/easyconfigs/g/GEOS/GEOS-3.5.0-foss-2015a-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..3053b75ee06b7b746731a5b69a05cc53285ae92a
--- /dev/null
+++ b/easybuild/easyconfigs/g/GEOS/GEOS-3.5.0-foss-2015a-Python-2.7.11.eb
@@ -0,0 +1,31 @@
+easyblock = 'ConfigureMake'
+
+name = 'GEOS'
+version = '3.5.0'
+
+homepage = 'http://trac.osgeo.org/geos'
+description = """GEOS (Geometry Engine - Open Source) is a C++ port of the  Java Topology Suite (JTS)"""
+
+toolchain = {'name': 'foss', 'version': '2015a'}
+
+source_urls = ['http://download.osgeo.org/geos/']
+sources = [SOURCELOWER_TAR_BZ2]
+
+pyver = '2.7.11'
+pyshortver = '.'.join(pyver.split('.')[0:2])
+versionsuffix = '-Python-%s' % pyver
+
+dependencies = [('Python', pyver)]
+
+builddependencies = [('SWIG', '3.0.8', versionsuffix)]
+    
+configopts = '--enable-python'
+
+modextrapaths = {'PYTHONPATH': 'lib/python%s/site-packages' % pyshortver}
+
+sanity_check_paths = {
+    'files': ['bin/geos-config', 'lib/libgeos.%s' % SHLIB_EXT, 'lib/libgeos.a', 'include/geos.h'],
+    'dirs': ['lib/python%s/site-packages/geos' % pyshortver]
+}
+
+moduleclass = 'math'
diff --git a/easybuild/easyconfigs/g/GHC/GHC-6.12.3.eb b/easybuild/easyconfigs/g/GHC/GHC-6.12.3.eb
index 0b40688cd7909cc720a4e86283de82528f8bbfec..125cb4abdd7b44137f03e796b9b89cf13ca6b228 100644
--- a/easybuild/easyconfigs/g/GHC/GHC-6.12.3.eb
+++ b/easybuild/easyconfigs/g/GHC/GHC-6.12.3.eb
@@ -6,7 +6,7 @@ description = """The Glorious/Glasgow Haskell Compiler"""
 
 toolchain = {'name': 'dummy', 'version': 'dummy'}
 
-sources = ['%s-%s-x86_64-unknown-linux-n.tar.bz2' % (name.lower(), version)]
-source_urls = ['http://www.haskell.org/ghc/dist/%s/' % version]
+sources = ['%(namelower)s-%(version)s-x86_64-unknown-linux-n.tar.bz2']
+source_urls = ['http://www.haskell.org/ghc/dist/%(version)s/']
 
 moduleclass = 'compiler'
diff --git a/easybuild/easyconfigs/g/GHC/GHC-7.4.2-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/g/GHC/GHC-7.4.2-goalf-1.1.0-no-OFED.eb
index fbac11c814ed268e4fbf2e9c1bc1728146b77d93..08afbb7d98533e570628731b2b53ef07c4558f73 100644
--- a/easybuild/easyconfigs/g/GHC/GHC-7.4.2-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/g/GHC/GHC-7.4.2-goalf-1.1.0-no-OFED.eb
@@ -7,8 +7,8 @@ description = """The Glorious/Glasgow Haskell Compiler"""
 toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
 toolchainopts = {'pic': True}
 
-sources = ['%s-%s-src.tar.bz2' % (name.lower(), version)]
-source_urls = ['http://www.haskell.org/ghc/dist/%s/' % version]
+sources = ['%(namelower)s-%(version)s-src.tar.bz2']
+source_urls = ['http://www.haskell.org/ghc/dist/%(version)s/']
 
 dependencies = [
     ('GMP', '5.0.5'),
diff --git a/easybuild/easyconfigs/g/GHC/GHC-7.4.2-goolf-1.4.10.eb b/easybuild/easyconfigs/g/GHC/GHC-7.4.2-goolf-1.4.10.eb
index 76088a4fcb2f60d50fe9505fc4873ab613f4d265..2f7b37d7ff4a34c1042f7de98c320069f31f4aa6 100644
--- a/easybuild/easyconfigs/g/GHC/GHC-7.4.2-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/g/GHC/GHC-7.4.2-goolf-1.4.10.eb
@@ -6,8 +6,8 @@ description = """The Glorious/Glasgow Haskell Compiler"""
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 toolchainopts = {'pic': True}
 
-sources = ['%s-%s-src.tar.bz2' % (name.lower(), version)]
-source_urls = ['http://www.haskell.org/ghc/dist/%s/' % version]
+sources = ['%(namelower)s-%(version)s-src.tar.bz2']
+source_urls = ['http://www.haskell.org/ghc/dist/%(version)s/']
 
 dependencies = [
     ('GMP', '5.0.5'),
diff --git a/easybuild/easyconfigs/g/GHC/GHC-7.6.2-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/g/GHC/GHC-7.6.2-goalf-1.1.0-no-OFED.eb
index 9a068844e14e2036d49aff7435213dee6a6d44bd..898e8c42ae5f8660a7c6d5feb779c2c14d8c6dfc 100644
--- a/easybuild/easyconfigs/g/GHC/GHC-7.6.2-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/g/GHC/GHC-7.6.2-goalf-1.1.0-no-OFED.eb
@@ -6,8 +6,8 @@ description = """GHC is the Glasgow Haskell Compiler."""
 
 toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
 
-sources = ['%s-%s-src.tar.bz2' % (name.lower(), version)]
-source_urls =  ['http://www.haskell.org/ghc/dist/%s/' % version]
+sources = ['%(namelower)s-%(version)s-src.tar.bz2']
+source_urls = ['http://www.haskell.org/ghc/dist/%(version)s/']
 
 dependencies = [
     ('GMP', '5.0.5'),
diff --git a/easybuild/easyconfigs/g/GHC/GHC-7.6.2-goolf-1.4.10.eb b/easybuild/easyconfigs/g/GHC/GHC-7.6.2-goolf-1.4.10.eb
index 36f3fcc67a3b3e96cc1a17aa4882aa8c57029de5..60a039090d69f7b12d7ecb139686927f2a768dcf 100644
--- a/easybuild/easyconfigs/g/GHC/GHC-7.6.2-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/g/GHC/GHC-7.6.2-goolf-1.4.10.eb
@@ -5,8 +5,8 @@ homepage = 'http://www.haskell.org/ghc'
 description = """GHC is the Glasgow Haskell Compiler."""
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 
-sources = ['%s-%s-src.tar.bz2' % (name.lower(), version)]
-source_urls =  ['http://www.haskell.org/ghc/dist/%s/' % version]
+sources = ['%(namelower)s-%(version)s-src.tar.bz2']
+source_urls = ['http://www.haskell.org/ghc/dist/%(version)s/']
 
 dependencies = [
     ('GMP', '5.0.5'),
diff --git a/easybuild/easyconfigs/g/GHC/GHC-7.8.3-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/g/GHC/GHC-7.8.3-goalf-1.1.0-no-OFED.eb
index 8fecfa9a315f18c3f6eae1a266aa476ab7b67636..2a900a50286a0d6f8b489787b5bb52ff31de5555 100644
--- a/easybuild/easyconfigs/g/GHC/GHC-7.8.3-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/g/GHC/GHC-7.8.3-goalf-1.1.0-no-OFED.eb
@@ -5,8 +5,8 @@ homepage = 'http://www.haskell.org/ghc'
 description = """GHC is the Glasgow Haskell Compiler."""
 toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
 
-sources = ['%s-%s-src.tar.bz2' % (name.lower(), version)]
-source_urls =  ['http://www.haskell.org/ghc/dist/%s/' % version]
+sources = ['%(namelower)s-%(version)s-src.tar.bz2']
+source_urls = ['http://www.haskell.org/ghc/dist/%(version)s/']
 
 dependencies = [
     ('GMP', '5.0.5'),
diff --git a/easybuild/easyconfigs/g/GHC/GHC-7.8.3-goolf-1.4.10.eb b/easybuild/easyconfigs/g/GHC/GHC-7.8.3-goolf-1.4.10.eb
index ea5b087cdd48c2bf563eceb383606454e09ee947..1a594faa37aedaf7e4f069e47653934cda62a683 100644
--- a/easybuild/easyconfigs/g/GHC/GHC-7.8.3-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/g/GHC/GHC-7.8.3-goolf-1.4.10.eb
@@ -5,8 +5,8 @@ homepage = 'http://www.haskell.org/ghc'
 description = """GHC is the Glasgow Haskell Compiler."""
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 
-sources = ['%s-%s-src.tar.bz2' % (name.lower(), version)]
-source_urls =  ['http://www.haskell.org/ghc/dist/%s/' % version]
+sources = ['%(namelower)s-%(version)s-src.tar.bz2']
+source_urls = ['http://www.haskell.org/ghc/dist/%(version)s/']
 
 dependencies = [
     ('GMP', '5.0.5'),
diff --git a/easybuild/easyconfigs/g/GLIMMER/GLIMMER-3.02b-goolf-1.4.10.eb b/easybuild/easyconfigs/g/GLIMMER/GLIMMER-3.02b-goolf-1.4.10.eb
index 5079733d9193d893f3f46c7abbba36523960d250..8ad521809b871d0804a7307f3c3a5046962699fd 100644
--- a/easybuild/easyconfigs/g/GLIMMER/GLIMMER-3.02b-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/g/GLIMMER/GLIMMER-3.02b-goolf-1.4.10.eb
@@ -6,7 +6,7 @@
 # License::   MIT/GPL
 #
 ##
-easyblock='MakeCp'
+easyblock = 'MakeCp'
 
 name = "GLIMMER"
 version = "3.02b"
diff --git a/easybuild/easyconfigs/g/GLIMMER/GLIMMER-3.02b-ictce-5.3.0.eb b/easybuild/easyconfigs/g/GLIMMER/GLIMMER-3.02b-ictce-5.3.0.eb
index 7722b501dd6818c69637546daf49b50bf248410f..e4aa1f5c2e294bbdbabfebdc4a4f594a7d4248e3 100644
--- a/easybuild/easyconfigs/g/GLIMMER/GLIMMER-3.02b-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/g/GLIMMER/GLIMMER-3.02b-ictce-5.3.0.eb
@@ -6,7 +6,7 @@
 # License::   MIT/GPL
 #
 ##
-easyblock='MakeCp'
+easyblock = 'MakeCp'
 
 name = "GLIMMER"
 version = "3.02b"
diff --git a/easybuild/easyconfigs/g/GLib/GLib-2.41.2-intel-2014b.eb b/easybuild/easyconfigs/g/GLib/GLib-2.41.2-intel-2014b.eb
index 207b74b508693927fe7713ecb120fc278e71c848..e534334b71bd0e438dd2bfe77280870481bc078c 100644
--- a/easybuild/easyconfigs/g/GLib/GLib-2.41.2-intel-2014b.eb
+++ b/easybuild/easyconfigs/g/GLib/GLib-2.41.2-intel-2014b.eb
@@ -5,7 +5,8 @@ version = '2.41.2'
 
 homepage = 'http://www.gtk.org/'
 description = """GLib is one of the base libraries of the GTK+ project"""
-toolchain = {'name': 'intel', 'version': '2014b'} # tweaked by EasyBuild (was: {'name': 'foss', 'version': '2014b'})
+
+toolchain = {'name': 'intel', 'version': '2014b'}
 toolchainopts = {'optarch': True, 'pic': True}
 
 source_urls = ['http://ftp.gnome.org/pub/gnome/sources/glib/%(version_major_minor)s/']
diff --git a/easybuild/easyconfigs/g/GLib/GLib-2.44.1-intel-2015a-Python-2.7.10.eb b/easybuild/easyconfigs/g/GLib/GLib-2.44.1-intel-2015a-Python-2.7.10.eb
index cf36332497a828de4fc6b1e2d9935753148eee67..9f4e52261e8e0a1a79eb532dd2f344a1c326204b 100644
--- a/easybuild/easyconfigs/g/GLib/GLib-2.44.1-intel-2015a-Python-2.7.10.eb
+++ b/easybuild/easyconfigs/g/GLib/GLib-2.44.1-intel-2015a-Python-2.7.10.eb
@@ -16,9 +16,9 @@ dependencies = [
     ('libffi', '3.1'),
     ('gettext', '0.19.2'),
 ]
-python= 'Python'
+python = 'Python'
 pyver = '2.7.10'
-versionsuffix = '-%s-%s' %  (python, pyver)
+versionsuffix = '-%s-%s' % (python, pyver)
 builddependencies = [(python, pyver)]
 
 moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/g/GLib/GLib-2.47.5-intel-2016a.eb b/easybuild/easyconfigs/g/GLib/GLib-2.47.5-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..3dcfe3ad198e2c99348c2dda70f7c265156fab72
--- /dev/null
+++ b/easybuild/easyconfigs/g/GLib/GLib-2.47.5-intel-2016a.eb
@@ -0,0 +1,37 @@
+easyblock = 'ConfigureMake'
+
+name = 'GLib'
+version = '2.47.5'
+
+homepage = 'http://www.gtk.org/'
+description = """GLib is one of the base libraries of the GTK+ project"""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+toolchainopts = {'optarch': True, 'pic': True}
+
+source_urls = [FTPGNOME_SOURCE]
+sources = [SOURCELOWER_TAR_XZ]
+
+pyver = '2.7.11'
+pyshortver = '.'.join(pyver.split('.')[:2])
+pysuffix = '-Python-%s' % pyver
+
+dependencies = [
+    ('libffi', '3.2.1'),
+    ('gettext', '0.19.6'),
+    ('libxml2', '2.9.3', pysuffix),
+    ('PCRE', '8.38'),
+]
+
+builddependencies = [('Python', pyver)]
+
+configopts = "--disable-maintainer-mode --disable-silent-rules --disable-libelf --enable-static --enable-shared"
+
+postinstallcmds = ["sed -i -e 's|#!.*python|#!/usr/bin/env python|' %(installdir)s/bin/*"]
+
+sanity_check_paths = {
+    'files': ['lib/libglib-%(version_major)s.0.a', 'lib/libglib-%%(version_major)s.0.%s' % SHLIB_EXT],
+    'dirs': ['bin', 'include'],
+}
+
+moduleclass = 'vis'
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 d83527abe3bcb4a000b1a5d3be3a062363b83eaa..6189b95fa0b2c47ae7ef7d7e9d4bdc46675567f0 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
@@ -35,4 +35,3 @@ sanity_check_paths = {
 }
 
 moduleclass = 'bio'
-
diff --git a/easybuild/easyconfigs/g/GMP/GMP-6.0.0a-foss-2015b.eb b/easybuild/easyconfigs/g/GMP/GMP-6.0.0a-foss-2015b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..ab0d6b9ba8c8c678ef864cb1f99547ef59265dc1
--- /dev/null
+++ b/easybuild/easyconfigs/g/GMP/GMP-6.0.0a-foss-2015b.eb
@@ -0,0 +1,27 @@
+easyblock = 'ConfigureMake'
+
+name = 'GMP'
+version = '6.0.0a'
+
+homepage = 'http://gmplib.org/'
+description = """GMP is a free library for arbitrary precision arithmetic, 
+operating on signed integers, rational numbers, and floating point numbers. """
+
+toolchain = {'name': 'foss', 'version': '2015b'}
+toolchainopts = {'pic': True, 'precise': True}
+
+sources = [SOURCELOWER_TAR_BZ2]
+source_urls = [GNU_SOURCE]
+
+# enable C++ interface
+configopts = '--enable-cxx'
+
+runtest = 'check'
+
+sanity_check_paths = {
+    'files': ['lib/libgmp.%s' % SHLIB_EXT, 'include/gmp.h'],
+    'dirs': [],
+}
+
+moduleclass = 'math'
+
diff --git a/easybuild/easyconfigs/g/GMP/GMP-6.0.0a-intel-2015b.eb b/easybuild/easyconfigs/g/GMP/GMP-6.0.0a-intel-2015b.eb
index 1497e837466d004103e1341474a2d184c4f773e7..c2785aa4a79de12fb0c2cee1ee7f0326751b1ddf 100644
--- a/easybuild/easyconfigs/g/GMP/GMP-6.0.0a-intel-2015b.eb
+++ b/easybuild/easyconfigs/g/GMP/GMP-6.0.0a-intel-2015b.eb
@@ -28,4 +28,3 @@ sanity_check_paths = {
 }
 
 moduleclass = 'math'
-
diff --git a/easybuild/easyconfigs/g/GMP/GMP-6.1.0-foss-2015a.eb b/easybuild/easyconfigs/g/GMP/GMP-6.1.0-foss-2015a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..e5c8c08ed9cddb4ca1261af305720bf8964c4c92
--- /dev/null
+++ b/easybuild/easyconfigs/g/GMP/GMP-6.1.0-foss-2015a.eb
@@ -0,0 +1,30 @@
+easyblock = 'ConfigureMake'
+
+name = 'GMP'
+version = '6.1.0'
+
+homepage = 'http://gmplib.org/'
+description = """GMP is a free library for arbitrary precision arithmetic, 
+operating on signed integers, rational numbers, and floating point numbers. """
+
+toolchain = {'name': 'foss', 'version': '2015a'}
+toolchainopts = {'pic': True, 'precise': True}
+
+sources = [SOURCELOWER_TAR_BZ2]
+source_urls = ['http://ftp.gnu.org/gnu/gmp']
+
+builddependencies = [
+    ('Autotools', '20150215'),
+]
+
+# enable C++ interface
+configopts = '--enable-cxx'
+
+runtest = 'check'
+
+sanity_check_paths = {
+    'files': ['lib/libgmp.%s' % SHLIB_EXT, 'include/gmp.h'],
+    'dirs': [],
+}
+
+moduleclass = 'math'
diff --git a/easybuild/easyconfigs/g/GObject-Introspection/GObject-Introspection-1.47.1-intel-2016a.eb b/easybuild/easyconfigs/g/GObject-Introspection/GObject-Introspection-1.47.1-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..eaa343080de350899c80dbdc9c5bf1f93099cb2f
--- /dev/null
+++ b/easybuild/easyconfigs/g/GObject-Introspection/GObject-Introspection-1.47.1-intel-2016a.eb
@@ -0,0 +1,47 @@
+easyblock = 'ConfigureMake'
+
+name = 'GObject-Introspection'
+version = '1.47.1'
+
+homepage = 'https://wiki.gnome.org/GObjectIntrospection/'
+description = """GObject introspection is a middleware layer between C libraries
+ (using GObject) and language bindings. The C library can be scanned at
+ compile time and generate a metadata file, in addition to the actual
+ native C library. Then at runtime, language bindings can read this
+ metadata and automatically provide bindings to call into the C library."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+source_urls = [FTPGNOME_SOURCE]
+sources = [SOURCELOWER_TAR_XZ]
+
+pyver = '2.7.11'
+
+dependencies = [
+    ('Python', pyver),
+    ('GLib', '2.47.5'),
+    ('flex', '2.6.0'),
+    ('Bison', '3.0.4'),
+    ('cairo', '1.14.6'),
+    ('libffi', '3.2.1'),
+]
+
+builddependencies = [('Autotools', '20150215')]
+
+preconfigopts = "GI_SCANNER_DISABLE_CACHE=true "
+
+# avoid using hard-coded path to 'python' in shebang of scripts
+buildopts = "PYTHON=python"
+
+modextrapaths = {
+    'GI_TYPELIB_PATH': 'share',
+    'XDG_DATA_DIRS': 'share',
+}
+
+sanity_check_paths = {
+    'files': ['bin/g-ir-%s' % x for x in ['annotation-tool', 'compiler', 'generate', 'scanner']] +
+             ['lib/libgirepository-1.0.%s' % x for x in ['so', 'a']],
+    'dirs': ['include', 'share']
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/g/GPAW/GPAW-0.9.0.8965-goalf-1.1.0-no-OFED-Python-2.7.3.eb b/easybuild/easyconfigs/g/GPAW/GPAW-0.9.0.8965-goalf-1.1.0-no-OFED-Python-2.7.3.eb
index ed849d076b66b4a1d9975575d5bce7bbf3c9894a..4eac8c213dfe82cdbcc742567f7ddb8d6cde4180 100644
--- a/easybuild/easyconfigs/g/GPAW/GPAW-0.9.0.8965-goalf-1.1.0-no-OFED-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/g/GPAW/GPAW-0.9.0.8965-goalf-1.1.0-no-OFED-Python-2.7.3.eb
@@ -21,13 +21,13 @@ pythonshortver = '.'.join(pythonver.split('.')[0:2])
 versionsuffix = '-%s-%s' % (python, pythonver)
 
 dependencies = [
-                (python, pythonver),
-                ('ASE', '3.6.0.2515', versionsuffix)
-               ]
+    (python, pythonver),
+    ('ASE', '3.6.0.2515', versionsuffix)
+]
 
 sanity_check_paths = {
-                      'files': ['bin/gpaw%s' % x for x in ['', '-basis', '-mpisim', '-python', '-setup', '-test']],
-                      'dirs': ['lib/python%s/site-packages/%s' % (pythonshortver, name.lower())]
-                     }
+    'files': ['bin/gpaw%s' % x for x in ['', '-basis', '-mpisim', '-python', '-setup', '-test']],
+    'dirs': ['lib/python%s/site-packages/%s' % (pythonshortver, name.lower())]
+}
 
 moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/g/GPAW/GPAW-0.9.0.8965-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/g/GPAW/GPAW-0.9.0.8965-goolf-1.4.10-Python-2.7.3.eb
index b74ab76176f7dcdfddbb10df35ed61df38cf9627..c7f645394505054486f5d32c468f788eb3d991b4 100644
--- a/easybuild/easyconfigs/g/GPAW/GPAW-0.9.0.8965-goolf-1.4.10-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/g/GPAW/GPAW-0.9.0.8965-goolf-1.4.10-Python-2.7.3.eb
@@ -20,13 +20,13 @@ pythonshortver = '.'.join(pythonver.split('.')[0:2])
 versionsuffix = '-%s-%s' % (python, pythonver)
 
 dependencies = [
-                (python, pythonver),
-                ('ASE', '3.6.0.2515', versionsuffix)
-               ]
+    (python, pythonver),
+    ('ASE', '3.6.0.2515', versionsuffix)
+]
 
 sanity_check_paths = {
-                      'files': ['bin/gpaw%s' % x for x in ['', '-basis', '-mpisim', '-python', '-setup', '-test']],
-                      'dirs': ['lib/python%s/site-packages/%s' % (pythonshortver, name.lower())]
-                     }
+    'files': ['bin/gpaw%s' % x for x in ['', '-basis', '-mpisim', '-python', '-setup', '-test']],
+    'dirs': ['lib/python%s/site-packages/%s' % (pythonshortver, name.lower())]
+}
 
 moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/g/GPAW/GPAW-0.9.0.8965-ictce-4.0.6-Python-2.7.3.eb b/easybuild/easyconfigs/g/GPAW/GPAW-0.9.0.8965-ictce-4.0.6-Python-2.7.3.eb
index b784121754ac8ffe1b2fb0907af6e0a3d628654d..d4915b51fb13b834d93ae1ba4df856a39af72caa 100644
--- a/easybuild/easyconfigs/g/GPAW/GPAW-0.9.0.8965-ictce-4.0.6-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/g/GPAW/GPAW-0.9.0.8965-ictce-4.0.6-Python-2.7.3.eb
@@ -7,7 +7,7 @@ homepage = 'https://wiki.fysik.dtu.dk/gpaw/'
 description = """GPAW is a density-functional theory (DFT) Python code based on the projector-augmented wave (PAW)
  method and the atomic simulation environment (ASE). It uses real-space uniform grids and multigrid methods or 
  atom-centered basis-functions."""
-  
+
 toolchain = {'name': 'ictce', 'version': '4.0.6'}
 
 source_urls = ['https://wiki.fysik.dtu.dk/gpaw-files/']
@@ -21,13 +21,13 @@ pythonshortver = '.'.join(pythonver.split('.')[0:2])
 versionsuffix = '-%s-%s' % (python, pythonver)
 
 dependencies = [
-                (python, pythonver),
-                ('ASE', '3.6.0.2515', versionsuffix)
-               ]
+    (python, pythonver),
+    ('ASE', '3.6.0.2515', versionsuffix)
+]
 
 sanity_check_paths = {
-                      'files': ['bin/gpaw%s' % x for x in ['', '-basis', '-mpisim', '-python', '-setup', '-test']],
-                      'dirs': ['lib/python%s/site-packages/%s' % (pythonshortver, name.lower())]
-                     }
+    'files': ['bin/gpaw%s' % x for x in ['', '-basis', '-mpisim', '-python', '-setup', '-test']],
+    'dirs': ['lib/python%s/site-packages/%s' % (pythonshortver, name.lower())]
+}
 
 moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/g/GPAW/GPAW-0.9.0.8965-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/g/GPAW/GPAW-0.9.0.8965-ictce-5.3.0-Python-2.7.3.eb
index ed0f7d5368b8fb3311b0b15e78eae147e9279127..5403b3585f8ca8b0a81ecad23f65f855dc427155 100644
--- a/easybuild/easyconfigs/g/GPAW/GPAW-0.9.0.8965-ictce-5.3.0-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/g/GPAW/GPAW-0.9.0.8965-ictce-5.3.0-Python-2.7.3.eb
@@ -22,13 +22,13 @@ pythonshortver = '.'.join(pythonver.split('.')[0:2])
 versionsuffix = '-%s-%s' % (python, pythonver)
 
 dependencies = [
-                (python, pythonver),
-                ('ASE', '3.6.0.2515', versionsuffix)
-               ]
+    (python, pythonver),
+    ('ASE', '3.6.0.2515', versionsuffix)
+]
 
 sanity_check_paths = {
-                      'files': ['bin/gpaw%s' % x for x in ['', '-basis', '-mpisim', '-python', '-setup', '-test']],
-                      'dirs': ['lib/python%s/site-packages/%s' % (pythonshortver, name.lower())]
-                     }
+    'files': ['bin/gpaw%s' % x for x in ['', '-basis', '-mpisim', '-python', '-setup', '-test']],
+    'dirs': ['lib/python%s/site-packages/%s' % (pythonshortver, name.lower())]
+}
 
 moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/g/GSL/GSL-1.16-foss-2015b.eb b/easybuild/easyconfigs/g/GSL/GSL-1.16-foss-2015b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..ed67148304a69a9965928bf6217ad27a0305af06
--- /dev/null
+++ b/easybuild/easyconfigs/g/GSL/GSL-1.16-foss-2015b.eb
@@ -0,0 +1,18 @@
+easyblock = 'ConfigureMake'
+
+name = 'GSL'
+version = '1.16'
+
+homepage = 'http://www.gnu.org/software/gsl/'
+description = """The GNU Scientific Library (GSL) is a numerical library for C and C++ programmers.
+ The library provides a wide range of mathematical routines such as random number generators, special functions and least-squares fitting."""
+
+toolchain = {'name': 'foss', 'version': '2015b'}
+toolchainopts = {'opt': True, 'optarch': True, 'unroll': True, 'pic': True}
+
+source_urls = [GNU_SOURCE]
+sources = [SOURCELOWER_TAR_GZ]
+
+configopts = "--with-pic"
+
+moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/g/GTI/GTI-1.2.0-gompi-1.4.12-no-OFED.eb b/easybuild/easyconfigs/g/GTI/GTI-1.2.0-gompi-1.4.12-no-OFED.eb
index f600de3146a58590972a84f949824d13bb4d1a70..3d384db2d68111b215a92d8166ab627f7834f4b7 100644
--- a/easybuild/easyconfigs/g/GTI/GTI-1.2.0-gompi-1.4.12-no-OFED.eb
+++ b/easybuild/easyconfigs/g/GTI/GTI-1.2.0-gompi-1.4.12-no-OFED.eb
@@ -27,7 +27,7 @@ dependencies = [('PnMPI', '1.2.0')]
 
 builddependencies = [('CMake', '2.8.10.2')]
 
-configopts  = '-DCMAKE_BUILD_TYPE=Release -DPnMPI_INSTALL_PREFIX=${EBROOTPNMPI}'
+configopts = '-DCMAKE_BUILD_TYPE=Release -DPnMPI_INSTALL_PREFIX=${EBROOTPNMPI}'
 buildopts = 'CXXFLAGS="$CXXFLAGS -fpermissive"'
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/g/gtk+/gtk+-2.24.28-intel-2015a.eb b/easybuild/easyconfigs/g/GTK+/GTK+-2.24.28-intel-2015a.eb
similarity index 91%
rename from easybuild/easyconfigs/g/gtk+/gtk+-2.24.28-intel-2015a.eb
rename to easybuild/easyconfigs/g/GTK+/GTK+-2.24.28-intel-2015a.eb
index 289385029dcddb633dbe20464e5a546e496c3e09..2b49aad4acbf0b76bc2d27b871b4e30cc5b80cfb 100644
--- a/easybuild/easyconfigs/g/gtk+/gtk+-2.24.28-intel-2015a.eb
+++ b/easybuild/easyconfigs/g/GTK+/GTK+-2.24.28-intel-2015a.eb
@@ -1,6 +1,6 @@
 easyblock = 'ConfigureMake'
 
-name = 'gtk+'
+name = 'GTK+'
 version = '2.24.28'
 
 homepage = 'https://developer.gnome.org/gtk+/stable/'
@@ -15,7 +15,7 @@ sources = [SOURCELOWER_TAR_XZ]
 
 dependencies = [
     ('ATK', '2.16.0'),
-    ('gdk-pixbuf', '2.31.4'),
+    ('Gdk-Pixbuf', '2.31.4'),
     ('Pango', '1.37.1'),
 ]
 
diff --git a/easybuild/easyconfigs/g/gtk+/gtk+-2.24.28-intel-2015b.eb b/easybuild/easyconfigs/g/GTK+/GTK+-2.24.28-intel-2015b.eb
similarity index 91%
rename from easybuild/easyconfigs/g/gtk+/gtk+-2.24.28-intel-2015b.eb
rename to easybuild/easyconfigs/g/GTK+/GTK+-2.24.28-intel-2015b.eb
index 9fe946073fe0a4f67cfedef2afefa3ce8967955a..65211f662c2491afd63c5d43a9fdb912e9fd1a72 100644
--- a/easybuild/easyconfigs/g/gtk+/gtk+-2.24.28-intel-2015b.eb
+++ b/easybuild/easyconfigs/g/GTK+/GTK+-2.24.28-intel-2015b.eb
@@ -1,6 +1,6 @@
 easyblock = 'ConfigureMake'
 
-name = 'gtk+'
+name = 'GTK+'
 version = '2.24.28'
 
 homepage = 'https://developer.gnome.org/gtk+/stable/'
@@ -15,7 +15,7 @@ sources = [SOURCELOWER_TAR_XZ]
 
 dependencies = [
     ('ATK', '2.16.0'),
-    ('gdk-pixbuf', '2.31.4'),
+    ('Gdk-Pixbuf', '2.31.4'),
     ('Pango', '1.37.1'),
 ]
 
diff --git a/easybuild/easyconfigs/g/GTK+/GTK+-2.24.28-intel-2016a.eb b/easybuild/easyconfigs/g/GTK+/GTK+-2.24.28-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..c29db47cc8e8e9dc19dca13f589b6131cc87b5d2
--- /dev/null
+++ b/easybuild/easyconfigs/g/GTK+/GTK+-2.24.28-intel-2016a.eb
@@ -0,0 +1,25 @@
+easyblock = 'ConfigureMake'
+
+name = 'GTK+'
+version = '2.24.28'
+
+homepage = 'https://developer.gnome.org/gtk+/stable/'
+description = """
+ The GTK+ 2 package contains libraries used for creating graphical user interfaces for applications.
+"""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+source_urls = [FTPGNOME_SOURCE]
+sources = [SOURCELOWER_TAR_XZ]
+
+dependencies = [
+    ('ATK', '2.18.0'),
+    ('Gdk-Pixbuf', '2.32.3'),
+    ('Pango', '1.39.0'),
+    ('GObject-Introspection', '1.47.1'),
+]
+
+configopts = "--disable-silent-rules --disable-glibtest --enable-introspection=yes --disable-visibility "
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/g/GTS/GTS-0.7.6-intel-2014b.eb b/easybuild/easyconfigs/g/GTS/GTS-0.7.6-intel-2014b.eb
index 20a9adba503eb4c45b290af32a7f460836b40385..5c0a28293c30f3339b1ee4540d004baca4185018 100644
--- a/easybuild/easyconfigs/g/GTS/GTS-0.7.6-intel-2014b.eb
+++ b/easybuild/easyconfigs/g/GTS/GTS-0.7.6-intel-2014b.eb
@@ -14,7 +14,7 @@ source_urls = [SOURCEFORGE_SOURCE]
 sources = [SOURCELOWER_TAR_GZ]
 
 dependencies = [
-     ('GLib', '2.40.0'),
+    ('GLib', '2.40.0'),
 ]
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/g/GTS/GTS-0.7.6-intel-2015a-GLib-2.44.1.eb b/easybuild/easyconfigs/g/GTS/GTS-0.7.6-intel-2015a-GLib-2.44.1.eb
index 540cb5407196a61b5b7715bfbeaf9ae4399258d7..4aff5dab8ab4697ccc91f3661718f226c7c08328 100644
--- a/easybuild/easyconfigs/g/GTS/GTS-0.7.6-intel-2015a-GLib-2.44.1.eb
+++ b/easybuild/easyconfigs/g/GTS/GTS-0.7.6-intel-2015a-GLib-2.44.1.eb
@@ -18,7 +18,7 @@ glibver = '2.44.1'
 versionsuffix = '-%s-%s' % (glib, glibver)
 
 dependencies = [
-     (glib, glibver),
+    (glib, glibver),
 ]
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/g/gdk-pixbuf/gdk-pixbuf-2.31.4-intel-2015a.eb b/easybuild/easyconfigs/g/Gdk-Pixbuf/Gdk-Pixbuf-2.31.4-intel-2015a.eb
similarity index 97%
rename from easybuild/easyconfigs/g/gdk-pixbuf/gdk-pixbuf-2.31.4-intel-2015a.eb
rename to easybuild/easyconfigs/g/Gdk-Pixbuf/Gdk-Pixbuf-2.31.4-intel-2015a.eb
index 5cb8ff5f1fc6ff2e43b97646fe1d47dd3c04bdf0..3eef94efe957a6795f96f1bd35b5f1751d20e1f2 100644
--- a/easybuild/easyconfigs/g/gdk-pixbuf/gdk-pixbuf-2.31.4-intel-2015a.eb
+++ b/easybuild/easyconfigs/g/Gdk-Pixbuf/Gdk-Pixbuf-2.31.4-intel-2015a.eb
@@ -1,6 +1,6 @@
 easyblock = 'ConfigureMake'
 
-name = 'gdk-pixbuf'
+name = 'Gdk-Pixbuf'
 version = '2.31.4'
 
 homepage = 'https://developer.gnome.org/gdk-pixbuf/stable/'
diff --git a/easybuild/easyconfigs/g/gdk-pixbuf/gdk-pixbuf-2.31.4-intel-2015b.eb b/easybuild/easyconfigs/g/Gdk-Pixbuf/Gdk-Pixbuf-2.31.4-intel-2015b.eb
similarity index 97%
rename from easybuild/easyconfigs/g/gdk-pixbuf/gdk-pixbuf-2.31.4-intel-2015b.eb
rename to easybuild/easyconfigs/g/Gdk-Pixbuf/Gdk-Pixbuf-2.31.4-intel-2015b.eb
index 018df1e421d4835b720ba617fb477bc88272aa3f..628f1553a7e8e225319c22aabf9cf976c7874091 100644
--- a/easybuild/easyconfigs/g/gdk-pixbuf/gdk-pixbuf-2.31.4-intel-2015b.eb
+++ b/easybuild/easyconfigs/g/Gdk-Pixbuf/Gdk-Pixbuf-2.31.4-intel-2015b.eb
@@ -1,6 +1,6 @@
 easyblock = 'ConfigureMake'
 
-name = 'gdk-pixbuf'
+name = 'Gdk-Pixbuf'
 version = '2.31.4'
 
 homepage = 'https://developer.gnome.org/gdk-pixbuf/stable/'
diff --git a/easybuild/easyconfigs/g/Gdk-Pixbuf/Gdk-Pixbuf-2.32.3-intel-2016a.eb b/easybuild/easyconfigs/g/Gdk-Pixbuf/Gdk-Pixbuf-2.32.3-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..6348507d8db6443c8b5320792db077f1e4e3a3db
--- /dev/null
+++ b/easybuild/easyconfigs/g/Gdk-Pixbuf/Gdk-Pixbuf-2.32.3-intel-2016a.eb
@@ -0,0 +1,35 @@
+easyblock = 'ConfigureMake'
+
+name = 'Gdk-Pixbuf'
+version = '2.32.3'
+
+homepage = 'https://developer.gnome.org/gdk-pixbuf/stable/'
+description = """
+ The Gdk Pixbuf is a toolkit for image loading and pixel buffer manipulation.
+ It is used by GTK+ 2 and GTK+ 3 to load and manipulate images. In the past it
+ was distributed as part of GTK+ 2 but it was split off into a separate package
+ in preparation for the change to GTK+ 3.
+"""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+source_urls = [FTPGNOME_SOURCE]
+sources = [SOURCELOWER_TAR_XZ]
+
+glibver = '2.47.5'
+dependencies = [
+    ('GLib', glibver),
+    ('libjpeg-turbo', '1.4.2'),
+    ('libpng', '1.6.21'),
+    ('LibTIFF', '4.0.6'),
+    ('GObject-Introspection', '1.47.1')
+]
+
+configopts = "--disable-maintainer-mode --enable-debug=no --enable-introspection=yes "
+configopts += "--disable-Bsymbolic --without-gdiplus --enable-shared --enable-static"
+
+modextrapaths = {
+    'XDG_DATA_DIRS': 'share',
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/g/Geant4/Geant4-9.4.p02-ictce-4.0.6.eb b/easybuild/easyconfigs/g/Geant4/Geant4-9.4.p02-ictce-4.0.6.eb
index 32054f56b53a7ebc2ab1949eb9c70bf71650f6b2..dd53f8508842ddf78dae7f69fb94826d1d06a1a2 100644
--- a/easybuild/easyconfigs/g/Geant4/Geant4-9.4.p02-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/g/Geant4/Geant4-9.4.p02-ictce-4.0.6.eb
@@ -6,7 +6,7 @@ description = """Geant4 is a toolkit for the simulation of the passage of partic
  Its areas of application include high energy, nuclear and accelerator physics, 
  as well as studies in medical and space science."""
 
-toolchain = {'name': 'ictce', 'version':'4.0.6'}
+toolchain = {'name': 'ictce', 'version': '4.0.6'}
 
 source_urls = ['http://geant4.cern.ch/support/source']
 sources = ['%(namelower)s.%(version)s.tar.gz']
diff --git a/easybuild/easyconfigs/g/Geant4/Geant4-9.5.p01-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/g/Geant4/Geant4-9.5.p01-goalf-1.1.0-no-OFED.eb
index b6f358819ffeaeabf5fbccf398e426fe643934f9..fbf3b03c0b5b104cb2e5bfb3add6a19ed005060d 100644
--- a/easybuild/easyconfigs/g/Geant4/Geant4-9.5.p01-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/g/Geant4/Geant4-9.5.p01-goalf-1.1.0-no-OFED.eb
@@ -6,7 +6,7 @@ description = """Geant4 is a toolkit for the simulation of the passage of partic
  Its areas of application include high energy, nuclear and accelerator physics, 
  as well as studies in medical and space science."""
 
-toolchain = {'name': 'goalf', 'version':'1.1.0-no-OFED'}
+toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
 
 source_urls = ['http://geant4.cern.ch/support/source']
 sources = ['%(namelower)s.%(version)s.tar.gz']
diff --git a/easybuild/easyconfigs/g/Geant4/Geant4-9.5.p01-ictce-4.0.6.eb b/easybuild/easyconfigs/g/Geant4/Geant4-9.5.p01-ictce-4.0.6.eb
index d2acaf5f1dc015f712dced0af0ec377ec07a16f4..8eb3941ded72027456217a433e3c5f9acdf94341 100644
--- a/easybuild/easyconfigs/g/Geant4/Geant4-9.5.p01-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/g/Geant4/Geant4-9.5.p01-ictce-4.0.6.eb
@@ -6,7 +6,7 @@ description = """Geant4 is a toolkit for the simulation of the passage of partic
  Its areas of application include high energy, nuclear and accelerator physics, 
  as well as studies in medical and space science."""
 
-toolchain = {'name': 'ictce', 'version':'4.0.6'}
+toolchain = {'name': 'ictce', 'version': '4.0.6'}
 
 source_urls = ['http://geant4.cern.ch/support/source']
 sources = ['%(namelower)s.%(version)s.tar.gz']
diff --git a/easybuild/easyconfigs/g/GenotypeHarmonizer/GenotypeHarmonizer-1.4.14-Java-1.7.0_80.eb b/easybuild/easyconfigs/g/GenotypeHarmonizer/GenotypeHarmonizer-1.4.14-Java-1.7.0_80.eb
index 0fa0ab2a82059ddfd643b9cd7fadd2967e62876a..df30b5f05b3a93b20e3da108345ec34738472f27 100644
--- a/easybuild/easyconfigs/g/GenotypeHarmonizer/GenotypeHarmonizer-1.4.14-Java-1.7.0_80.eb
+++ b/easybuild/easyconfigs/g/GenotypeHarmonizer/GenotypeHarmonizer-1.4.14-Java-1.7.0_80.eb
@@ -15,7 +15,7 @@ versionsuffix = '-%s-%s' % (java, javaver)
 dependencies = [(java, javaver)]
 
 source_urls = ['http://www.molgenis.org/downloads/GenotypeHarmonizer/']
-sources = ['GenotypeHarmonizer-%(version)s-dist.tar.gz' ]
+sources = ['GenotypeHarmonizer-%(version)s-dist.tar.gz']
 
 checksums = ['0a7b041efdd7a5d7ced0ae48eb4a9e06']
 
diff --git a/easybuild/easyconfigs/g/Graphviz/Graphviz-2.38.0-intel-2014b.eb b/easybuild/easyconfigs/g/Graphviz/Graphviz-2.38.0-intel-2014b.eb
index fdd14fa479330e33ec628603f5e6a8207e246b0f..aee7aa31e0d8e0d995475d8ef5b924ed7d4fe7e0 100644
--- a/easybuild/easyconfigs/g/Graphviz/Graphviz-2.38.0-intel-2014b.eb
+++ b/easybuild/easyconfigs/g/Graphviz/Graphviz-2.38.0-intel-2014b.eb
@@ -42,8 +42,8 @@ builddependencies = [
 ]
 
 patches = [
-   'Graphviz-2.38.0_icc_vmalloc.patch',
-   'Graphviz-2.38.0_icc_sfio.patch',
+    'Graphviz-2.38.0_icc_vmalloc.patch',
+    'Graphviz-2.38.0_icc_sfio.patch',
 ]
 
 configopts = '--enable-guile=no --enable-lua=no --enable-ocaml=no '
diff --git a/easybuild/easyconfigs/g/Graphviz/Graphviz-2.38.0-intel-2015a-Python-2.7.10.eb b/easybuild/easyconfigs/g/Graphviz/Graphviz-2.38.0-intel-2015a-Python-2.7.10.eb
index f2c3631ad016a68ff7fd34848fa4f09d2e5b3661..231a5ddb6f76d9f2472c91c66f44d92e3f71e009 100644
--- a/easybuild/easyconfigs/g/Graphviz/Graphviz-2.38.0-intel-2015a-Python-2.7.10.eb
+++ b/easybuild/easyconfigs/g/Graphviz/Graphviz-2.38.0-intel-2015a-Python-2.7.10.eb
@@ -44,8 +44,8 @@ builddependencies = [
 ]
 
 patches = [
-   'Graphviz-2.38.0_icc_vmalloc.patch',
-   'Graphviz-2.38.0_icc_sfio.patch',
+    'Graphviz-2.38.0_icc_vmalloc.patch',
+    'Graphviz-2.38.0_icc_sfio.patch',
 ]
 
 configopts = '--enable-guile=no --enable-lua=no --enable-ocaml=no '
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 f946da12a260d8d2f29d1c253a413e434b340bdc..042f52f5f8e5454a0164e38a8b1318cc0866c324 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
@@ -15,7 +15,7 @@ sources = [SOURCELOWER_TAR_XZ]
 
 dependencies = [
     ('Atkmm', '2.22.7'),
-    ('gtk+', '2.24.28'),
+    ('GTK+', '2.24.28'),
     ('Pangomm', '2.36.0'),
 ]
 
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 60c1e59723ffabf7a8dce421c4f55496811112ee..3e73c97004c020ff74e0b6a4c690f95a93f96a92 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
@@ -15,7 +15,7 @@ sources = [SOURCELOWER_TAR_XZ]
 
 dependencies = [
     ('Atkmm', '2.22.7'),
-    ('gtk+', '2.24.28'),
+    ('GTK+', '2.24.28'),
     ('Pangomm', '2.36.0'),
 ]
 
diff --git a/easybuild/easyconfigs/g/gettext/gettext-0.19.6-intel-2016a.eb b/easybuild/easyconfigs/g/gettext/gettext-0.19.6-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..d58aad19704156cd425a3c24894c1991bfd0c3b6
--- /dev/null
+++ b/easybuild/easyconfigs/g/gettext/gettext-0.19.6-intel-2016a.eb
@@ -0,0 +1,18 @@
+easyblock = 'ConfigureMake'
+
+name = 'gettext'
+version = '0.19.6'
+
+homepage = 'http://www.gnu.org/software/gettext/'
+description = """GNU `gettext' is an important step for the GNU Translation Project, as it is an asset on which we may
+build many other steps. This package offers to programmers, translators, and even users, a well integrated set of tools
+and documentation"""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = [GNU_SOURCE]
+
+configopts = '--without-emacs'
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/g/git/git-1.7.12-ictce-5.3.0.eb b/easybuild/easyconfigs/g/git/git-1.7.12-ictce-5.3.0.eb
index 75c6bb092fe802f903df8c843f8393473102e008..4c4de493037651fe3ccdbb025998f1537947df5f 100644
--- a/easybuild/easyconfigs/g/git/git-1.7.12-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/g/git/git-1.7.12-ictce-5.3.0.eb
@@ -30,8 +30,8 @@ dependencies = [('gettext', '0.18.2')]
 configopts = "--enable-pthreads='-lpthread'"
 
 sanity_check_paths = {
-                      'files': ["bin/git"],
-                      'dirs': []
-                     }
+    'files': ["bin/git"],
+    'dirs': []
+}
 
 moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/g/glproto/glproto-1.4.16-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/g/glproto/glproto-1.4.16-goalf-1.1.0-no-OFED.eb
index e26ff137e517a0f40ee9812b31220151d702f85c..f9c5e14a8e3b42f6e1a1e44e40b8f869a894ca55 100644
--- a/easybuild/easyconfigs/g/glproto/glproto-1.4.16-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/g/glproto/glproto-1.4.16-goalf-1.1.0-no-OFED.eb
@@ -13,9 +13,8 @@ sources = [SOURCE_TAR_GZ]
 source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
 
 sanity_check_paths = {
-                      'files': ['include/GL/%s.h' % x for x in ['glxint', 'glxmd', 'glxproto',
-                                                                'glxtokens', 'internal/glcore']],
-                      'dirs': []
-                     }
+    'files': ['include/GL/%s.h' % x for x in ['glxint', 'glxmd', 'glxproto', 'glxtokens', 'internal/glcore']],
+    'dirs': []
+}
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/g/glproto/glproto-1.4.16-goolf-1.4.10.eb b/easybuild/easyconfigs/g/glproto/glproto-1.4.16-goolf-1.4.10.eb
index a46e3dcda1bce6994689cd6f76e37621c8694e5c..06b846c04cf64bc56723494b711a004e9489978b 100644
--- a/easybuild/easyconfigs/g/glproto/glproto-1.4.16-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/g/glproto/glproto-1.4.16-goolf-1.4.10.eb
@@ -12,9 +12,8 @@ sources = [SOURCE_TAR_GZ]
 source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
 
 sanity_check_paths = {
-                      'files': ['include/GL/%s.h' % x for x in ['glxint', 'glxmd', 'glxproto',
-                                                                'glxtokens', 'internal/glcore']],
-                      'dirs': []
-                     }
+    'files': ['include/GL/%s.h' % x for x in ['glxint', 'glxmd', 'glxproto', 'glxtokens', 'internal/glcore']],
+    'dirs': []
+}
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/g/glproto/glproto-1.4.16-ictce-4.0.6.eb b/easybuild/easyconfigs/g/glproto/glproto-1.4.16-ictce-4.0.6.eb
index 172016aad31deb64cb85b00c1ccda0cbb0e8aea2..42dc60dd5eaa4e48e825ae00ae2c3bdb8257ac76 100644
--- a/easybuild/easyconfigs/g/glproto/glproto-1.4.16-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/g/glproto/glproto-1.4.16-ictce-4.0.6.eb
@@ -13,9 +13,8 @@ sources = [SOURCE_TAR_GZ]
 source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
 
 sanity_check_paths = {
-                      'files': ['include/GL/%s.h' % x for x in ['glxint', 'glxmd', 'glxproto',
-                                                                'glxtokens', 'internal/glcore']],
-                      'dirs': []
-                     }
+    'files': ['include/GL/%s.h' % x for x in ['glxint', 'glxmd', 'glxproto', 'glxtokens', 'internal/glcore']],
+    'dirs': []
+}
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/g/glproto/glproto-1.4.16-ictce-4.1.13.eb b/easybuild/easyconfigs/g/glproto/glproto-1.4.16-ictce-4.1.13.eb
index 69cf5deb96ff220806652c6655fb9de29ff9d4ec..8b99a901c9ba30ae2af29a320cbeac0cedecd3c7 100644
--- a/easybuild/easyconfigs/g/glproto/glproto-1.4.16-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/g/glproto/glproto-1.4.16-ictce-4.1.13.eb
@@ -13,8 +13,7 @@ sources = [SOURCE_TAR_GZ]
 source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
 
 sanity_check_paths = {
-    'files': ['include/GL/%s.h' % x for x in ['glxint', 'glxmd', 'glxproto',
-                                              'glxtokens', 'internal/glcore']],
+    'files': ['include/GL/%s.h' % x for x in ['glxint', 'glxmd', 'glxproto', 'glxtokens', 'internal/glcore']],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/g/glproto/glproto-1.4.16-ictce-5.3.0.eb b/easybuild/easyconfigs/g/glproto/glproto-1.4.16-ictce-5.3.0.eb
index d770bc9878ccf71855223684d250a78959e917ac..6ccc91bb752baaf87e6489e59b798f149c6af04e 100644
--- a/easybuild/easyconfigs/g/glproto/glproto-1.4.16-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/g/glproto/glproto-1.4.16-ictce-5.3.0.eb
@@ -14,9 +14,8 @@ sources = [SOURCE_TAR_GZ]
 source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
 
 sanity_check_paths = {
-                      'files': ['include/GL/%s.h' % x for x in ['glxint', 'glxmd', 'glxproto',
-                                                                'glxtokens', 'internal/glcore']],
-                      'dirs': []
-                     }
+    'files': ['include/GL/%s.h' % x for x in ['glxint', 'glxmd', 'glxproto', 'glxtokens', 'internal/glcore']],
+    'dirs': []
+}
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/g/glproto/glproto-1.4.16-ictce-5.5.0.eb b/easybuild/easyconfigs/g/glproto/glproto-1.4.16-ictce-5.5.0.eb
index 828a170d2017e5d00d2cbe5343fdee7f75aaf3d4..256687687906470d69bdc3f6a241e0c009023571 100644
--- a/easybuild/easyconfigs/g/glproto/glproto-1.4.16-ictce-5.5.0.eb
+++ b/easybuild/easyconfigs/g/glproto/glproto-1.4.16-ictce-5.5.0.eb
@@ -13,8 +13,7 @@ sources = [SOURCE_TAR_GZ]
 source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
 
 sanity_check_paths = {
-    'files': ['include/GL/%s.h' % x for x in ['glxint', 'glxmd', 'glxproto',
-                                              'glxtokens', 'internal/glcore']],
+    'files': ['include/GL/%s.h' % x for x in ['glxint', 'glxmd', 'glxproto', 'glxtokens', 'internal/glcore']],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/g/glproto/glproto-1.4.17-intel-2015a.eb b/easybuild/easyconfigs/g/glproto/glproto-1.4.17-intel-2015a.eb
index e6478944220aff106ad7a49015f88255bc326e02..4eb87a66efd1fe6b55f8d992fb6ca1fe848911ec 100644
--- a/easybuild/easyconfigs/g/glproto/glproto-1.4.17-intel-2015a.eb
+++ b/easybuild/easyconfigs/g/glproto/glproto-1.4.17-intel-2015a.eb
@@ -13,8 +13,7 @@ sources = [SOURCE_TAR_GZ]
 source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
 
 sanity_check_paths = {
-    'files': ['include/GL/%s.h' % x for x in ['glxint', 'glxmd', 'glxproto',
-                                              'glxtokens', 'internal/glcore']],
+    'files': ['include/GL/%s.h' % x for x in ['glxint', 'glxmd', 'glxproto', 'glxtokens', 'internal/glcore']],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/g/glproto/glproto-1.4.17-intel-2015b.eb b/easybuild/easyconfigs/g/glproto/glproto-1.4.17-intel-2015b.eb
index 251ef3579842b43f1622ab90344b3628f3328f12..a1f9a0b9d22a071f09d996b820ddeaa372380c92 100644
--- a/easybuild/easyconfigs/g/glproto/glproto-1.4.17-intel-2015b.eb
+++ b/easybuild/easyconfigs/g/glproto/glproto-1.4.17-intel-2015b.eb
@@ -13,8 +13,7 @@ sources = [SOURCE_TAR_GZ]
 source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
 
 sanity_check_paths = {
-    'files': ['include/GL/%s.h' % x for x in ['glxint', 'glxmd', 'glxproto',
-                                              'glxtokens', 'internal/glcore']],
+    'files': ['include/GL/%s.h' % x for x in ['glxint', 'glxmd', 'glxproto', 'glxtokens', 'internal/glcore']],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/g/gnuplot/gnuplot-4.6.0-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/g/gnuplot/gnuplot-4.6.0-goalf-1.1.0-no-OFED.eb
index 81a026fc55888cf7d1f16fbcde2f0db787261161..bd0bbb0ca0db768196110c0ee569439c878d7730 100644
--- a/easybuild/easyconfigs/g/gnuplot/gnuplot-4.6.0-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/g/gnuplot/gnuplot-4.6.0-goalf-1.1.0-no-OFED.eb
@@ -24,8 +24,8 @@ source_urls = [('http://sourceforge.net/projects/gnuplot/files', 'download')]
 toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
 
 sanity_check_paths = {
-                      'files': ['bin/gnuplot'],
-                      'dirs': []
-                     }
+    'files': ['bin/gnuplot'],
+    'dirs': []
+}
 
 moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/g/gnuplot/gnuplot-4.6.0-goolf-1.4.10.eb b/easybuild/easyconfigs/g/gnuplot/gnuplot-4.6.0-goolf-1.4.10.eb
index 9c6317ae8b142e3935430efca5c1a9f86d9b36fd..3d45dffc3f5c2883578a85493949d6e2791b7376 100644
--- a/easybuild/easyconfigs/g/gnuplot/gnuplot-4.6.0-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/g/gnuplot/gnuplot-4.6.0-goolf-1.4.10.eb
@@ -23,8 +23,8 @@ source_urls = [('http://sourceforge.net/projects/gnuplot/files', 'download')]
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 
 sanity_check_paths = {
-                      'files': ['bin/gnuplot'],
-                      'dirs': []
-                     }
+    'files': ['bin/gnuplot'],
+    'dirs': []
+}
 
 moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/g/gnuplot/gnuplot-4.6.0-ictce-4.0.6.eb b/easybuild/easyconfigs/g/gnuplot/gnuplot-4.6.0-ictce-4.0.6.eb
index a473b4546fdc53316bf822d82bb3984b605f4712..23b0d23f05c8f65830a7cb89f7aacfbc235cbb80 100644
--- a/easybuild/easyconfigs/g/gnuplot/gnuplot-4.6.0-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/g/gnuplot/gnuplot-4.6.0-ictce-4.0.6.eb
@@ -24,8 +24,8 @@ source_urls = [('http://sourceforge.net/projects/gnuplot/files', 'download')]
 toolchain = {'version': '4.0.6', 'name': 'ictce'}
 
 sanity_check_paths = {
-                      'files': ['bin/gnuplot'],
-                      'dirs': []
-                     }
+    'files': ['bin/gnuplot'],
+    'dirs': []
+}
 
 moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/g/gnuplot/gnuplot-4.6.0-ictce-5.3.0.eb b/easybuild/easyconfigs/g/gnuplot/gnuplot-4.6.0-ictce-5.3.0.eb
index c4db96bf9619fec2d40ae7b2b2718ac495b2113e..b95685cff8af9a42f7c7aab5832f352a11c6ff4a 100644
--- a/easybuild/easyconfigs/g/gnuplot/gnuplot-4.6.0-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/g/gnuplot/gnuplot-4.6.0-ictce-5.3.0.eb
@@ -25,8 +25,8 @@ source_urls = [('http://sourceforge.net/projects/gnuplot/files', 'download')]
 toolchain = {'name': 'ictce', 'version': '5.3.0'}
 
 sanity_check_paths = {
-                      'files': ['bin/gnuplot'],
-                      'dirs': []
-                     }
+    'files': ['bin/gnuplot'],
+    'dirs': []
+}
 
 moduleclass = 'vis'
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 9315e9e792cf09033563a2dbdc0889079e9aaeb9..6090cb398e1f6908f6f0f7fb38e55229b8658126 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
@@ -12,18 +12,18 @@ source_urls = ['ftp://ftp.gnutls.org/pub/gnutls/']
 sources = [SOURCE_TAR_XZ]
 
 dependencies = [
-                ('GMP', '5.0.5'),
-                ('nettle', '2.6'),
-                ('guile', '1.8.8'),
-               ]
+    ('GMP', '5.0.5'),
+    ('nettle', '2.6'),
+    ('guile', '1.8.8'),
+]
 
 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']] +
-                               ['lib/libgnutls%s' % x for x in ['.a', 'xx.a', '-xssl.a', '-openssl.a']],
-                      'dirs': ['include/gnutls'],
-                     }
+    'files': ['bin/%s' % x for x in ['certtool', 'danetool', 'gnutls-cli', 'gnutls-cli-debug',
+                                     'gnutls-serv', 'ocsptool', 'psktool', 'srptool']] +
+             ['lib/libgnutls%s' % x for x in ['.a', 'xx.a', '-xssl.a', '-openssl.a']],
+    'dirs': ['include/gnutls'],
+}
 
 moduleclass = 'system'
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 0fc5d46401d3723509a29a1d16fde9f7643094b2..f7c7021f17c8dbd48a4fa1c34d2d9ff6d9d3de1f 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
@@ -11,18 +11,18 @@ source_urls = ['ftp://ftp.gnutls.org/pub/gnutls/']
 sources = [SOURCE_TAR_XZ]
 
 dependencies = [
-                ('GMP', '5.0.5'),
-                ('nettle', '2.6'),
-                ('guile', '1.8.8'),
-               ]
+    ('GMP', '5.0.5'),
+    ('nettle', '2.6'),
+    ('guile', '1.8.8'),
+]
 
 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']] +
-                               ['lib/libgnutls%s' % x for x in ['.a', 'xx.a', '-xssl.a', '-openssl.a']],
-                      'dirs': ['include/gnutls'],
-                     }
+    'files': ['bin/%s' % x for x in ['certtool', 'danetool', 'gnutls-cli', 'gnutls-cli-debug',
+                                     'gnutls-serv', 'ocsptool', 'psktool', 'srptool']] +
+             ['lib/libgnutls%s' % x for x in ['.a', 'xx.a', '-xssl.a', '-openssl.a']],
+    'dirs': ['include/gnutls'],
+}
 
 moduleclass = 'system'
diff --git a/easybuild/easyconfigs/g/gperf/gperf-3.0.4-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/g/gperf/gperf-3.0.4-goalf-1.1.0-no-OFED.eb
index a5318892cfa4b07fdb315a2603190e82708fbaed..62b829ab9bda8ddcca81345244c3390a68435498 100644
--- a/easybuild/easyconfigs/g/gperf/gperf-3.0.4-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/g/gperf/gperf-3.0.4-goalf-1.1.0-no-OFED.eb
@@ -15,8 +15,8 @@ source_urls = [GNU_SOURCE]
 sources = [SOURCELOWER_TAR_GZ]
 
 sanity_check_paths = {
-                      'files': ['bin/gperf'],
-                      'dirs': []
-                     }
+    'files': ['bin/gperf'],
+    'dirs': []
+}
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/g/gperf/gperf-3.0.4-goolf-1.4.10.eb b/easybuild/easyconfigs/g/gperf/gperf-3.0.4-goolf-1.4.10.eb
index ef454942121a60f28c5c0f344fe86398df72523f..7b5f1aee641a7d47e2d6c957acbb3d5170f29044 100644
--- a/easybuild/easyconfigs/g/gperf/gperf-3.0.4-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/g/gperf/gperf-3.0.4-goolf-1.4.10.eb
@@ -14,8 +14,8 @@ source_urls = [GNU_SOURCE]
 sources = [SOURCELOWER_TAR_GZ]
 
 sanity_check_paths = {
-                      'files': ['bin/gperf'],
-                      'dirs': []
-                     }
+    'files': ['bin/gperf'],
+    'dirs': []
+}
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/g/gperf/gperf-3.0.4-ictce-4.0.6.eb b/easybuild/easyconfigs/g/gperf/gperf-3.0.4-ictce-4.0.6.eb
index 574b337302a453601ea407d64e2ee0cf930eea3b..6b2cf276843676fc4c3354374b5e36ea4c1dd842 100644
--- a/easybuild/easyconfigs/g/gperf/gperf-3.0.4-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/g/gperf/gperf-3.0.4-ictce-4.0.6.eb
@@ -15,8 +15,8 @@ source_urls = [GNU_SOURCE]
 sources = [SOURCELOWER_TAR_GZ]
 
 sanity_check_paths = {
-                      'files': ['bin/gperf'],
-                      'dirs': []
-                     }
+    'files': ['bin/gperf'],
+    'dirs': []
+}
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/g/gperf/gperf-3.0.4-ictce-5.3.0.eb b/easybuild/easyconfigs/g/gperf/gperf-3.0.4-ictce-5.3.0.eb
index c2990d170235a226ac7932a7a8828a8d24029b2b..d55ea61bd078a9d4bf52469436a8d12cb71f3af9 100644
--- a/easybuild/easyconfigs/g/gperf/gperf-3.0.4-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/g/gperf/gperf-3.0.4-ictce-5.3.0.eb
@@ -16,8 +16,8 @@ source_urls = [GNU_SOURCE]
 sources = [SOURCELOWER_TAR_GZ]
 
 sanity_check_paths = {
-                      'files': ['bin/gperf'],
-                      'dirs': []
-                     }
+    'files': ['bin/gperf'],
+    'dirs': []
+}
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/g/gperf/gperf-3.0.4-intel-2016a.eb b/easybuild/easyconfigs/g/gperf/gperf-3.0.4-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..5938576aa76b14062f227b7c89e36fe487de0b86
--- /dev/null
+++ b/easybuild/easyconfigs/g/gperf/gperf-3.0.4-intel-2016a.eb
@@ -0,0 +1,22 @@
+easyblock = 'ConfigureMake'
+
+name = 'gperf'
+version = '3.0.4'
+
+homepage = 'http://www.gnu.org/software/gperf/'
+description = """GNU gperf is a perfect hash function generator. For a given list of strings, it produces a hash
+ function and hash table, in form of C or C++ code, for looking up a value depending on the input string. The hash
+ function is perfect, which means that the hash table has no collisions, and the hash table lookup needs a single
+ string comparison only."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+source_urls = [GNU_SOURCE]
+sources = [SOURCELOWER_TAR_GZ]
+
+sanity_check_paths = {
+    'files': ['bin/gperf'],
+    'dirs': []
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/g/gpsmpi/gpsmpi-2014.12.eb b/easybuild/easyconfigs/g/gpsmpi/gpsmpi-2014.12.eb
index a65b44153943c3f9f7032e5bd825149cf5ad0d7e..57ee8055446b96f1a91491ef04a79f03b7537b58 100644
--- a/easybuild/easyconfigs/g/gpsmpi/gpsmpi-2014.12.eb
+++ b/easybuild/easyconfigs/g/gpsmpi/gpsmpi-2014.12.eb
@@ -21,8 +21,7 @@ comp = (compname, compver)
 
 dependencies = [
     comp,
-    (mpilib, mpiver, '', comp ),
+    (mpilib, mpiver, '', comp),
 ]
 
 moduleclass = 'toolchain'
-
diff --git a/easybuild/easyconfigs/g/gpsolf/gpsolf-2014.12.eb b/easybuild/easyconfigs/g/gpsolf/gpsolf-2014.12.eb
index 5eacc9a99c2123dcff0651bac8885cc46a39d422..6a6f1377bc82102b869aaf1d10f78ab9a5f624f1 100644
--- a/easybuild/easyconfigs/g/gpsolf/gpsolf-2014.12.eb
+++ b/easybuild/easyconfigs/g/gpsolf/gpsolf-2014.12.eb
@@ -33,4 +33,3 @@ dependencies = [
 ]
 
 moduleclass = 'toolchain'
-
diff --git a/easybuild/easyconfigs/g/grib_api/grib_api-1.9.18-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/g/grib_api/grib_api-1.9.18-goalf-1.1.0-no-OFED.eb
index 5cea12d320bd02b03f168adc785696153fe6c0a8..ef2423ee53111d75fd2653ca06cfe8861c3f8a75 100644
--- a/easybuild/easyconfigs/g/grib_api/grib_api-1.9.18-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/g/grib_api/grib_api-1.9.18-goalf-1.1.0-no-OFED.eb
@@ -14,8 +14,8 @@ source_urls = ['https://software.ecmwf.int/wiki/download/attachments/3473437/']
 sources = [SOURCE_TAR_GZ]
 
 dependencies = [
-                ('JasPer', '1.900.1'),
-               ]
+    ('JasPer', '1.900.1'),
+]
 
 preconfigopts = 'FC=$F90'
 configopts = '--with-jasper=$EBROOTJASPER'
diff --git a/easybuild/easyconfigs/g/grib_api/grib_api-1.9.18-goolf-1.4.10.eb b/easybuild/easyconfigs/g/grib_api/grib_api-1.9.18-goolf-1.4.10.eb
index 8e5630b19cf6c34aa0f46afa817e73c25e7b1bcf..c0f9f1c6d84ab72e71f15f13bb063ed8b4e3fa5c 100644
--- a/easybuild/easyconfigs/g/grib_api/grib_api-1.9.18-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/g/grib_api/grib_api-1.9.18-goolf-1.4.10.eb
@@ -13,8 +13,8 @@ source_urls = ['https://software.ecmwf.int/wiki/download/attachments/3473437/']
 sources = [SOURCE_TAR_GZ]
 
 dependencies = [
-                ('JasPer', '1.900.1'),
-               ]
+    ('JasPer', '1.900.1'),
+]
 
 preconfigopts = 'FC=$F90'
 configopts = '--with-jasper=$EBROOTJASPER'
diff --git a/easybuild/easyconfigs/g/grib_api/grib_api-1.9.18-ictce-4.1.13.eb b/easybuild/easyconfigs/g/grib_api/grib_api-1.9.18-ictce-4.1.13.eb
index 2e926b4cab4f3127fd1bb4d24c83b671832e7a25..384aa93ebf4a83eb860f32ea75f465dc46ba0e19 100644
--- a/easybuild/easyconfigs/g/grib_api/grib_api-1.9.18-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/g/grib_api/grib_api-1.9.18-ictce-4.1.13.eb
@@ -14,8 +14,8 @@ source_urls = ['https://software.ecmwf.int/wiki/download/attachments/3473437/']
 sources = [SOURCE_TAR_GZ]
 
 dependencies = [
-                ('JasPer', '1.900.1'),
-               ]
+    ('JasPer', '1.900.1'),
+]
 
 preconfigopts = 'FC=$F90'
 configopts = '--with-jasper=$EBROOTJASPER'
diff --git a/easybuild/easyconfigs/g/grib_api/grib_api-1.9.18-ictce-5.3.0.eb b/easybuild/easyconfigs/g/grib_api/grib_api-1.9.18-ictce-5.3.0.eb
index 831f1d1677c41735888b01eeda0f393cce1af7a3..048ac9570d3e78b0aeadcc9724ae231d1ea0b0de 100644
--- a/easybuild/easyconfigs/g/grib_api/grib_api-1.9.18-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/g/grib_api/grib_api-1.9.18-ictce-5.3.0.eb
@@ -15,8 +15,8 @@ source_urls = ['https://software.ecmwf.int/wiki/download/attachments/3473437/']
 sources = [SOURCE_TAR_GZ]
 
 dependencies = [
-                ('JasPer', '1.900.1'),
-               ]
+    ('JasPer', '1.900.1'),
+]
 
 preconfigopts = 'FC=$F90'
 configopts = '--with-jasper=$EBROOTJASPER'
diff --git a/easybuild/easyconfigs/g/gtest/gtest-1.6.0-intel-2014b.eb b/easybuild/easyconfigs/g/gtest/gtest-1.6.0-intel-2014b.eb
index 785c4e7264232619bf0e6e91659403c6b2a020ca..cd4e4b08f5f6cd3b249a9939519cfc38e8c517f0 100644
--- a/easybuild/easyconfigs/g/gtest/gtest-1.6.0-intel-2014b.eb
+++ b/easybuild/easyconfigs/g/gtest/gtest-1.6.0-intel-2014b.eb
@@ -15,7 +15,7 @@ with_configure = True
 
 files_to_copy = ['lib', 'include']
 
-sanity_check_paths={
+sanity_check_paths = {
     'files': ['lib/libgtest.la', 'lib/libgtest_main.la'],
     'dirs': ['include'],
 }
diff --git a/easybuild/easyconfigs/g/gtkglext/gtkglext-1.2.0-intel-2015b.eb b/easybuild/easyconfigs/g/gtkglext/gtkglext-1.2.0-intel-2015b.eb
index 24f8fc107092b2fcbc31634a986ccbaaa0a7320b..a0f2ba3078e85e4a60fa1fa04afa23d2e2ea8946 100644
--- a/easybuild/easyconfigs/g/gtkglext/gtkglext-1.2.0-intel-2015b.eb
+++ b/easybuild/easyconfigs/g/gtkglext/gtkglext-1.2.0-intel-2015b.eb
@@ -15,7 +15,7 @@ patches = ['gtkglext-%(version)s_fix-gtk-compat.patch']
 
 pangover = '1.37.1'
 dependencies = [
-    ('gtk+', '2.24.28'),
+    ('GTK+', '2.24.28'),
     ('Pango', pangover),
     ('pangox-compat', '0.0.2', '-Pango-%s' % pangover),
 ]
diff --git a/easybuild/easyconfigs/g/guile/guile-1.8.8-GNU-4.9.3-2.25.eb b/easybuild/easyconfigs/g/guile/guile-1.8.8-GNU-4.9.3-2.25.eb
index 561706f56f1fc974f7f79811b697217ca03274b5..65946ec224e68fda099e06b38735290f6b2ba104 100644
--- a/easybuild/easyconfigs/g/guile/guile-1.8.8-GNU-4.9.3-2.25.eb
+++ b/easybuild/easyconfigs/g/guile/guile-1.8.8-GNU-4.9.3-2.25.eb
@@ -24,7 +24,8 @@ dependencies = [
 configopts = " --enable-error-on-warning=no"
 
 sanity_check_paths = {
-    'files': ["bin/%s" % x for x in ["guile", 'guile-config', 'guile-snarf', 'guile-tools']] + ["lib/libguile.a", "include/libguile.h"],
+    'files': ["bin/%s" % x for x in ["guile", 'guile-config', 'guile-snarf', 'guile-tools']] +
+             ["lib/libguile.a", "include/libguile.h"],
     'dirs': []
 }
 
diff --git a/easybuild/easyconfigs/g/guile/guile-1.8.8-foss-2015b.eb b/easybuild/easyconfigs/g/guile/guile-1.8.8-foss-2015b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..8e2c6a3db096ee7443693005d5851547afd0c7f3
--- /dev/null
+++ b/easybuild/easyconfigs/g/guile/guile-1.8.8-foss-2015b.eb
@@ -0,0 +1,32 @@
+easyblock = 'ConfigureMake'
+
+name = 'guile'
+version = '1.8.8'
+
+homepage = 'http://www.gnu.org/software/guile'
+description = """Guile is the GNU Ubiquitous Intelligent Language for Extensions,
+ the official extension language for the GNU operating system."""
+
+toolchain = {'name': 'foss', 'version': '2015b'}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = [GNU_SOURCE]
+
+dependencies = [
+    ('libtool', '2.4.6', '', ('GNU', '4.9.3-2.25')),
+    ('GMP', '6.0.0a'),
+    ('libunistring', '0.9.3'),
+    ('pkg-config', '0.27.1'),
+    ('libffi', '3.0.13'),
+    ('libreadline', '6.3'),
+]
+
+configopts = " --enable-error-on-warning=no"
+
+sanity_check_paths = {
+    'files': ["bin/%s" % x for x in ["guile", 'guile-config', 'guile-snarf', 'guile-tools']] +
+             ["lib/libguile.a", "include/libguile.h"],
+    'dirs': []
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/g/guile/guile-1.8.8-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/g/guile/guile-1.8.8-goalf-1.1.0-no-OFED.eb
index 17fa80e4dfa8120878e3ce38eadf03461d44b70c..35f61dcc34e7f05becb8db06d3180ae926594a51 100644
--- a/easybuild/easyconfigs/g/guile/guile-1.8.8-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/g/guile/guile-1.8.8-goalf-1.1.0-no-OFED.eb
@@ -13,19 +13,20 @@ sources = [SOURCELOWER_TAR_GZ]
 source_urls = [GNU_SOURCE]
 
 dependencies = [
-                ('libtool', '2.4.2'),
-                ('GMP', '5.0.5'),
-                ('libunistring', '0.9.3'),
-                ('pkg-config', '0.27.1'),
-                ('libffi', '3.0.11'),
-                ('libreadline', '6.2'),
-               ]
+    ('libtool', '2.4.2'),
+    ('GMP', '5.0.5'),
+    ('libunistring', '0.9.3'),
+    ('pkg-config', '0.27.1'),
+    ('libffi', '3.0.11'),
+    ('libreadline', '6.2'),
+]
 
 configopts = " --enable-error-on-warning=no"
 
 sanity_check_paths = {
-                      'files': ["bin/%s" % x for x in ["guile", 'guile-config', 'guile-snarf', 'guile-tools']] + ["lib/libguile.a", "include/libguile.h"],
-                      'dirs': []
-                     }
+    'files': ["bin/%s" % x for x in ["guile", 'guile-config', 'guile-snarf', 'guile-tools']] +
+             ["lib/libguile.a", "include/libguile.h"],
+    'dirs': []
+}
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/g/guile/guile-1.8.8-goolf-1.4.10.eb b/easybuild/easyconfigs/g/guile/guile-1.8.8-goolf-1.4.10.eb
index 80c9c684315e7d6bdb73407d3249c3fb41a53bea..1ff3a6fc786dc4a56adb72b583124c5613f6aabd 100644
--- a/easybuild/easyconfigs/g/guile/guile-1.8.8-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/g/guile/guile-1.8.8-goolf-1.4.10.eb
@@ -12,19 +12,20 @@ sources = [SOURCELOWER_TAR_GZ]
 source_urls = [GNU_SOURCE]
 
 dependencies = [
-                ('libtool', '2.4.2'),
-                ('GMP', '5.0.5'),
-                ('libunistring', '0.9.3'),
-                ('pkg-config', '0.27.1'),
-                ('libffi', '3.0.11'),
-                ('libreadline', '6.2'),
-               ]
+    ('libtool', '2.4.2'),
+    ('GMP', '5.0.5'),
+    ('libunistring', '0.9.3'),
+    ('pkg-config', '0.27.1'),
+    ('libffi', '3.0.11'),
+    ('libreadline', '6.2'),
+]
 
 configopts = " --enable-error-on-warning=no"
 
 sanity_check_paths = {
-                      'files': ["bin/%s" % x for x in ["guile", 'guile-config', 'guile-snarf', 'guile-tools']] + ["lib/libguile.a", "include/libguile.h"],
-                      'dirs': []
-                     }
+    'files': ["bin/%s" % x for x in ["guile", 'guile-config', 'guile-snarf', 'guile-tools']] +
+             ["lib/libguile.a", "include/libguile.h"],
+    'dirs': []
+}
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/g/guile/guile-1.8.8-ictce-4.0.6.eb b/easybuild/easyconfigs/g/guile/guile-1.8.8-ictce-4.0.6.eb
index 67e9066e3ce679d5f24d3a83b862798c0608c50f..88054289c0763f8a4426be409b2f3b34ab51a1e3 100644
--- a/easybuild/easyconfigs/g/guile/guile-1.8.8-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/g/guile/guile-1.8.8-ictce-4.0.6.eb
@@ -13,19 +13,20 @@ sources = [SOURCELOWER_TAR_GZ]
 source_urls = [GNU_SOURCE]
 
 dependencies = [
-                ('libtool', '2.4.2'),
-                ('GMP', '5.0.5'),
-                ('libunistring', '0.9.3'),
-                ('pkg-config', '0.27.1'),
-                ('libffi', '3.0.11'),
-                ('libreadline', '6.2'),
-               ]
+    ('libtool', '2.4.2'),
+    ('GMP', '5.0.5'),
+    ('libunistring', '0.9.3'),
+    ('pkg-config', '0.27.1'),
+    ('libffi', '3.0.11'),
+    ('libreadline', '6.2'),
+]
 
 configopts = " --enable-error-on-warning=no"
 
 sanity_check_paths = {
-                      'files': ["bin/%s" % x for x in ["guile", 'guile-config', 'guile-snarf', 'guile-tools']] + ["lib/libguile.a", "include/libguile.h"],
-                      'dirs': []
-                     }
+    'files': ["bin/%s" % x for x in ["guile", 'guile-config', 'guile-snarf', 'guile-tools']] +
+             ["lib/libguile.a", "include/libguile.h"],
+    'dirs': []
+}
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/g/guile/guile-1.8.8-ictce-5.3.0.eb b/easybuild/easyconfigs/g/guile/guile-1.8.8-ictce-5.3.0.eb
index 18eb7970f8af91dcf4966a33a5d8c8416ff136d6..0ed91b303989983b225ddc1d5c671b51bf1fd813 100644
--- a/easybuild/easyconfigs/g/guile/guile-1.8.8-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/g/guile/guile-1.8.8-ictce-5.3.0.eb
@@ -24,7 +24,8 @@ dependencies = [
 configopts = " --enable-error-on-warning=no"
 
 sanity_check_paths = {
-    'files': ["bin/%s" % x for x in ["guile", 'guile-config', 'guile-snarf', 'guile-tools']] + ["lib/libguile.a", "include/libguile.h"],
+    'files': ["bin/%s" % x for x in ["guile", 'guile-config', 'guile-snarf', 'guile-tools']] +
+             ["lib/libguile.a", "include/libguile.h"],
     'dirs': []
 }
 
diff --git a/easybuild/easyconfigs/g/guile/guile-1.8.8-intel-2015a.eb b/easybuild/easyconfigs/g/guile/guile-1.8.8-intel-2015a.eb
index d66e7cf11837a739f0a6cd0d3c38ebb1938643f2..d10a3259ca1441faf4d7906c0ba5534603b4aa5d 100644
--- a/easybuild/easyconfigs/g/guile/guile-1.8.8-intel-2015a.eb
+++ b/easybuild/easyconfigs/g/guile/guile-1.8.8-intel-2015a.eb
@@ -24,7 +24,8 @@ dependencies = [
 configopts = " --enable-error-on-warning=no"
 
 sanity_check_paths = {
-    'files': ["bin/%s" % x for x in ["guile", 'guile-config', 'guile-snarf', 'guile-tools']] + ["lib/libguile.a", "include/libguile.h"],
+    'files': ["bin/%s" % x for x in ["guile", 'guile-config', 'guile-snarf', 'guile-tools']] +
+             ["lib/libguile.a", "include/libguile.h"],
     'dirs': []
 }
 
diff --git a/easybuild/easyconfigs/g/guile/guile-1.8.8-intel-2015b.eb b/easybuild/easyconfigs/g/guile/guile-1.8.8-intel-2015b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..ecd844f29d41cf698f839d10eb9ab1232ddfb307
--- /dev/null
+++ b/easybuild/easyconfigs/g/guile/guile-1.8.8-intel-2015b.eb
@@ -0,0 +1,32 @@
+easyblock = 'ConfigureMake'
+
+name = 'guile'
+version = '1.8.8'
+
+homepage = 'http://www.gnu.org/software/guile'
+description = """Guile is the GNU Ubiquitous Intelligent Language for Extensions,
+ the official extension language for the GNU operating system."""
+
+toolchain = {'name': 'intel', 'version': '2015b'}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = [GNU_SOURCE]
+
+dependencies = [
+    ('libtool', '2.4.6', '', ('GNU', '4.9.3-2.25')),
+    ('GMP', '6.0.0a'),
+    ('libunistring', '0.9.3'),
+    ('pkg-config', '0.27.1'),
+    ('libffi', '3.0.13'),
+    ('libreadline', '6.3'),
+]
+
+configopts = " --enable-error-on-warning=no"
+
+sanity_check_paths = {
+    'files': ["bin/%s" % x for x in ["guile", 'guile-config', 'guile-snarf', 'guile-tools']] +
+             ["lib/libguile.a", "include/libguile.h"],
+    'dirs': []
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/h/HDF5/HDF5-1.8.10-ictce-4.1.13-gpfs.eb b/easybuild/easyconfigs/h/HDF5/HDF5-1.8.10-ictce-4.1.13-gpfs.eb
index 031479c2f3c8f5c71a74b49b8094e5928f6b4953..ec1b30de6932a7fbdbf5e1c33233f58a1bb8056b 100644
--- a/easybuild/easyconfigs/h/HDF5/HDF5-1.8.10-ictce-4.1.13-gpfs.eb
+++ b/easybuild/easyconfigs/h/HDF5/HDF5-1.8.10-ictce-4.1.13-gpfs.eb
@@ -19,7 +19,7 @@ patches = [
 
 dependencies = [
     ('zlib', '1.2.7'),
-    ('Szip','2.1'),
+    ('Szip', '2.1'),
 ]
 
 configopts = "--enable-gpfs"
diff --git a/easybuild/easyconfigs/h/HDF5/HDF5-1.8.10-intel-2014b-gpfs.eb b/easybuild/easyconfigs/h/HDF5/HDF5-1.8.10-intel-2014b-gpfs.eb
index 62eff2e443c3115ec6e57ccf84fc236d19690bca..fa45e3d80d2354f7de84154234ef2b8d274052c6 100644
--- a/easybuild/easyconfigs/h/HDF5/HDF5-1.8.10-intel-2014b-gpfs.eb
+++ b/easybuild/easyconfigs/h/HDF5/HDF5-1.8.10-intel-2014b-gpfs.eb
@@ -19,7 +19,7 @@ patches = [
 
 dependencies = [
     ('zlib', '1.2.8'),
-    ('Szip','2.1'),
+    ('Szip', '2.1'),
 ]
 
 configopts = "--enable-gpfs"
diff --git a/easybuild/easyconfigs/h/HDF5/HDF5-1.8.15-patch1-foss-2015b.eb b/easybuild/easyconfigs/h/HDF5/HDF5-1.8.15-patch1-foss-2015b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..8b6038c4eef7e2fe06546170e9c1ea6b467719d3
--- /dev/null
+++ b/easybuild/easyconfigs/h/HDF5/HDF5-1.8.15-patch1-foss-2015b.eb
@@ -0,0 +1,23 @@
+name = 'HDF5'
+version = '1.8.15-patch1'
+
+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': 'foss', 'version': '2015b'}
+toolchainopts = {'optarch': True, 'pic': True, 'usempi': True}
+
+source_urls = ['http://www.hdfgroup.org/ftp/HDF5/releases/hdf5-%(version)s/src']
+sources = [SOURCELOWER_TAR_GZ]
+
+patches = ['configure_libtool.patch']
+
+buildopts = 'CXXFLAGS="$CXXFLAGS -DMPICH_IGNORE_CXX_SEEK"'
+
+dependencies = [
+    ('zlib', '1.2.8'),
+    ('Szip', '2.1'),
+]
+
+moduleclass = 'data'
diff --git a/easybuild/easyconfigs/h/HDF5/HDF5-1.8.16-foss-2015a.eb b/easybuild/easyconfigs/h/HDF5/HDF5-1.8.16-foss-2015a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..25e05e8e27ae22d5bdf4835410d7911f97018bdd
--- /dev/null
+++ b/easybuild/easyconfigs/h/HDF5/HDF5-1.8.16-foss-2015a.eb
@@ -0,0 +1,23 @@
+name = 'HDF5'
+version = '1.8.16'
+
+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': 'foss', 'version': '2015a'}
+toolchainopts = {'optarch': True, 'pic': True, 'usempi': True}
+
+source_urls = ['http://www.hdfgroup.org/ftp/HDF5/releases/hdf5-%(version)s/src']
+sources = [SOURCELOWER_TAR_GZ]
+
+patches = ['configure_libtool.patch']
+
+buildopts = 'CXXFLAGS="$CXXFLAGS -DMPICH_IGNORE_CXX_SEEK"'
+
+dependencies = [
+    ('zlib', '1.2.8'),
+    ('Szip', '2.1'),
+]
+
+moduleclass = 'data'
diff --git a/easybuild/easyconfigs/h/HDF5/HDF5-1.8.16-intel-2016a-serial.eb b/easybuild/easyconfigs/h/HDF5/HDF5-1.8.16-intel-2016a-serial.eb
new file mode 100644
index 0000000000000000000000000000000000000000..dc2e939bfa51a059afbb7caa5366c9b5bb907c8d
--- /dev/null
+++ b/easybuild/easyconfigs/h/HDF5/HDF5-1.8.16-intel-2016a-serial.eb
@@ -0,0 +1,25 @@
+name = 'HDF5'
+version = '1.8.16'
+versionsuffix = '-serial'
+
+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': 'intel', 'version': '2016a'}
+toolchainopts = {'optarch': True, 'pic': True, 'usempi': False}
+
+source_urls = ['http://www.hdfgroup.org/ftp/HDF5/releases/hdf5-%(version)s/src']
+sources = [SOURCELOWER_TAR_GZ]
+
+patches = [
+    'HDF5-1.8.15_configure_intel.patch',
+    'configure_libtool.patch',
+]
+
+dependencies = [
+    ('zlib', '1.2.8'),
+    ('Szip', '2.1'),
+]
+
+moduleclass = 'data'
diff --git a/easybuild/easyconfigs/h/HDF5/HDF5-1.8.16-intel-2016a.eb b/easybuild/easyconfigs/h/HDF5/HDF5-1.8.16-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..dc65dce562edb3031a04588bd4b0c3f4a354404a
--- /dev/null
+++ b/easybuild/easyconfigs/h/HDF5/HDF5-1.8.16-intel-2016a.eb
@@ -0,0 +1,26 @@
+name = 'HDF5'
+version = '1.8.16'
+
+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': 'intel', 'version': '2016a'}
+toolchainopts = {'optarch': True, 'pic': True, 'usempi': True}
+
+source_urls = ['http://www.hdfgroup.org/ftp/HDF5/releases/hdf5-%(version)s/src']
+sources = [SOURCELOWER_TAR_GZ]
+
+patches = [
+    'HDF5-1.8.15_configure_intel.patch',
+    'configure_libtool.patch',
+]
+
+buildopts = 'CXXFLAGS="$CXXFLAGS -DMPICH_IGNORE_CXX_SEEK"'
+
+dependencies = [
+    ('zlib', '1.2.8'),
+    ('Szip', '2.1'),
+]
+
+moduleclass = 'data'
diff --git a/easybuild/easyconfigs/h/HDF5/HDF5-1.8.9-ictce-5.2.0.eb b/easybuild/easyconfigs/h/HDF5/HDF5-1.8.9-ictce-5.2.0.eb
index 01668228092cc45c17dc45c3a7a5ba3cada9528e..7cd6cdf595c010a08fbf05315e0bc94e352bad16 100644
--- a/easybuild/easyconfigs/h/HDF5/HDF5-1.8.9-ictce-5.2.0.eb
+++ b/easybuild/easyconfigs/h/HDF5/HDF5-1.8.9-ictce-5.2.0.eb
@@ -18,8 +18,8 @@ patches = [
 ]
 
 dependencies = [
-    ('zlib','1.2.7'),
-    ('Szip','2.1'),
+    ('zlib', '1.2.7'),
+    ('Szip', '2.1'),
 ]
 
 moduleclass = 'data'
diff --git a/easybuild/easyconfigs/h/HH-suite/HH-suite-2.0.16-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/h/HH-suite/HH-suite-2.0.16-goalf-1.1.0-no-OFED.eb
index c29c1cc257be4a19b851286f946db2f1baf28a9f..9bc25a507114b8c75309d4389e804822118361cb 100644
--- a/easybuild/easyconfigs/h/HH-suite/HH-suite-2.0.16-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/h/HH-suite/HH-suite-2.0.16-goalf-1.1.0-no-OFED.eb
@@ -28,8 +28,8 @@ skipsteps = ['configure']
 installopts = "INSTALL_DIR=%(installdir)s"
 
 sanity_check_paths = {
-  'files': ["bin/hhalign", "bin/hhblits", "bin/hhconsensus", "bin/hhfilter", "bin/hhmake", "bin/hhsearch"],
-  'dirs': []
-  }
+    'files': ["bin/hhalign", "bin/hhblits", "bin/hhconsensus", "bin/hhfilter", "bin/hhmake", "bin/hhsearch"],
+    'dirs': []
+}
 
 moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/h/HH-suite/HH-suite-2.0.16-goolf-1.4.10.eb b/easybuild/easyconfigs/h/HH-suite/HH-suite-2.0.16-goolf-1.4.10.eb
index 6fd5c2e8bfc395919ae72fa9d922aef274f60617..562e5955579d97f4435fd6b8307457ff03a1c1cd 100644
--- a/easybuild/easyconfigs/h/HH-suite/HH-suite-2.0.16-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/h/HH-suite/HH-suite-2.0.16-goolf-1.4.10.eb
@@ -28,8 +28,8 @@ skipsteps = ['configure']
 installopts = "INSTALL_DIR=%(installdir)s"
 
 sanity_check_paths = {
-  'files': ["bin/hhalign", "bin/hhblits", "bin/hhconsensus", "bin/hhfilter", "bin/hhmake", "bin/hhsearch"],
-  'dirs': []
-  }
+    'files': ["bin/hhalign", "bin/hhblits", "bin/hhconsensus", "bin/hhfilter", "bin/hhmake", "bin/hhsearch"],
+    'dirs': []
+}
 
 moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/h/HMMER/HMMER-3.0-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/h/HMMER/HMMER-3.0-goalf-1.1.0-no-OFED.eb
index 3879fe81ad06dbe531e29b4bf96a315229bcbdb8..9f844f7f8c0b817a5d2427ba6b17da1cc22f5949 100644
--- a/easybuild/easyconfigs/h/HMMER/HMMER-3.0-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/h/HMMER/HMMER-3.0-goalf-1.1.0-no-OFED.eb
@@ -33,8 +33,8 @@ sources = ['hmmer-%s-linux-intel-x86_64.tar.gz' % version]
 source_urls = ['http://selab.janelia.org/software/%s/%s/' % (versiondir, version)]
 
 sanity_check_paths = {
-                      'files': ["bin/hmmemit", "bin/hmmsearch", "bin/hmmscan"],
-                      'dirs': []
-                     }
+    'files': ["bin/hmmemit", "bin/hmmsearch", "bin/hmmscan"],
+    'dirs': []
+}
 
 moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/h/HMMER/HMMER-3.0-goolf-1.4.10.eb b/easybuild/easyconfigs/h/HMMER/HMMER-3.0-goolf-1.4.10.eb
index 2c24669f8fc5c9b67fc91d198623720d6008dd37..ac2ff916ef27a8d5fe2d372342bcccd7035baabc 100644
--- a/easybuild/easyconfigs/h/HMMER/HMMER-3.0-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/h/HMMER/HMMER-3.0-goolf-1.4.10.eb
@@ -32,8 +32,8 @@ sources = ['hmmer-%s-linux-intel-x86_64.tar.gz' % version]
 source_urls = ['http://selab.janelia.org/software/%s/%s/' % (versiondir, version)]
 
 sanity_check_paths = {
-                      'files': ["bin/hmmemit", "bin/hmmsearch", "bin/hmmscan"],
-                      'dirs': []
-                     }
+    'files': ["bin/hmmemit", "bin/hmmsearch", "bin/hmmscan"],
+    'dirs': []
+}
 
 moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/h/HMMER/HMMER-3.0-ictce-4.0.6.eb b/easybuild/easyconfigs/h/HMMER/HMMER-3.0-ictce-4.0.6.eb
index 43301b81dcfae3558e831b904bc97251fbf4359f..4f2f846bc8dee0d57a914f07dc53dc6c1a636f7f 100644
--- a/easybuild/easyconfigs/h/HMMER/HMMER-3.0-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/h/HMMER/HMMER-3.0-ictce-4.0.6.eb
@@ -33,8 +33,8 @@ sources = ['hmmer-%s-linux-intel-x86_64.tar.gz' % version]
 source_urls = ['http://selab.janelia.org/software/%s/%s/' % (versiondir, version)]
 
 sanity_check_paths = {
-                      'files': ["bin/hmmemit", "bin/hmmsearch", "bin/hmmscan"],
-                      'dirs': []
-                     }
+    'files': ["bin/hmmemit", "bin/hmmsearch", "bin/hmmscan"],
+    'dirs': []
+}
 
 moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/h/HMMER/HMMER-3.0-ictce-5.3.0.eb b/easybuild/easyconfigs/h/HMMER/HMMER-3.0-ictce-5.3.0.eb
index 11e40f315c84681d4fe4818cc28a6d16c2fc9e40..52d15716803d368ab966c8e6b09891388fe31ef7 100644
--- a/easybuild/easyconfigs/h/HMMER/HMMER-3.0-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/h/HMMER/HMMER-3.0-ictce-5.3.0.eb
@@ -34,8 +34,8 @@ sources = ['hmmer-%s-linux-intel-x86_64.tar.gz' % version]
 source_urls = ['http://selab.janelia.org/software/%s/%s/' % (versiondir, version)]
 
 sanity_check_paths = {
-                      'files': ["bin/hmmemit", "bin/hmmsearch", "bin/hmmscan"],
-                      'dirs': []
-                     }
+    'files': ["bin/hmmemit", "bin/hmmsearch", "bin/hmmscan"],
+    'dirs': []
+}
 
 moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/h/HMMER/HMMER-3.1b1-goolf-1.4.10.eb b/easybuild/easyconfigs/h/HMMER/HMMER-3.1b1-goolf-1.4.10.eb
index 35d93e8b65b8611dcb589564e63e925ce6f5579b..7b6ea628da41335a95395e8ce6f5349d6d4860b7 100644
--- a/easybuild/easyconfigs/h/HMMER/HMMER-3.1b1-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/h/HMMER/HMMER-3.1b1-goolf-1.4.10.eb
@@ -35,7 +35,7 @@ installopts = ' && cd easel && make install'
 
 sanity_check_paths = {
     'files': ["bin/%s" % x for x in ["hmmemit", "hmmsearch", "hmmscan",
-                                    "esl-alimap", "esl-cluster", "esl-mask"]],
+                                     "esl-alimap", "esl-cluster", "esl-mask"]],
     'dirs': []
 }
 
diff --git a/easybuild/easyconfigs/h/HMMER/HMMER-3.1b1-ictce-5.3.0.eb b/easybuild/easyconfigs/h/HMMER/HMMER-3.1b1-ictce-5.3.0.eb
index 6b7248a777fe59c9cdbec725c6fdcd8bdf5139c9..65bc990310d9509ec8279b60ec1ede5e45b58278 100644
--- a/easybuild/easyconfigs/h/HMMER/HMMER-3.1b1-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/h/HMMER/HMMER-3.1b1-ictce-5.3.0.eb
@@ -35,7 +35,7 @@ installopts = ' && cd easel && make install'
 
 sanity_check_paths = {
     'files': ["bin/%s" % x for x in ["hmmemit", "hmmsearch", "hmmscan",
-                                    "esl-alimap", "esl-cluster", "esl-mask"]],
+                                     "esl-alimap", "esl-cluster", "esl-mask"]],
     'dirs': []
 }
 
diff --git a/easybuild/easyconfigs/h/HMMER/HMMER-3.1b1-ictce-6.2.5.eb b/easybuild/easyconfigs/h/HMMER/HMMER-3.1b1-ictce-6.2.5.eb
index b56baf902e770cfe966e1549053e9554f9a5a052..9a8eaafde67a75860f1a7956ca1fdddc76d5867e 100644
--- a/easybuild/easyconfigs/h/HMMER/HMMER-3.1b1-ictce-6.2.5.eb
+++ b/easybuild/easyconfigs/h/HMMER/HMMER-3.1b1-ictce-6.2.5.eb
@@ -35,7 +35,7 @@ installopts = ' && cd easel && make install'
 
 sanity_check_paths = {
     'files': ["bin/%s" % x for x in ["hmmemit", "hmmsearch", "hmmscan",
-                                    "esl-alimap", "esl-cluster", "esl-mask"]],
+                                     "esl-alimap", "esl-cluster", "esl-mask"]],
     'dirs': []
 }
 
diff --git a/easybuild/easyconfigs/h/HMMER/HMMER-3.1b2-intel-2015a.eb b/easybuild/easyconfigs/h/HMMER/HMMER-3.1b2-intel-2015a.eb
index 5255f85ddcd37709b77b7063e1420b3759793394..36707aa8fe6a15212d908d36948a09704da18975 100644
--- a/easybuild/easyconfigs/h/HMMER/HMMER-3.1b2-intel-2015a.eb
+++ b/easybuild/easyconfigs/h/HMMER/HMMER-3.1b2-intel-2015a.eb
@@ -34,7 +34,7 @@ installopts = ' && cd easel && make install'
 
 sanity_check_paths = {
     'files': ["bin/%s" % x for x in ["hmmemit", "hmmsearch", "hmmscan",
-                                    "esl-alimap", "esl-cluster", "esl-mask"]],
+                                     "esl-alimap", "esl-cluster", "esl-mask"]],
     'dirs': []
 }
 
diff --git a/easybuild/easyconfigs/h/HPCBIOS_Bioinfo/HPCBIOS_Bioinfo-20130829-goolf-1.4.10.eb b/easybuild/easyconfigs/h/HPCBIOS_Bioinfo/HPCBIOS_Bioinfo-20130829-goolf-1.4.10.eb
index b103b8110ee4e86d6b0825f45fce6739624e8c39..05c50b39b973ccb460ca143de66968375064d8c2 100644
--- a/easybuild/easyconfigs/h/HPCBIOS_Bioinfo/HPCBIOS_Bioinfo-20130829-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/h/HPCBIOS_Bioinfo/HPCBIOS_Bioinfo-20130829-goolf-1.4.10.eb
@@ -19,7 +19,7 @@ homepage = 'http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-94.html'
 description = """Bioinformatics & Computational Biology productivity environment includes a set of HPC tools,
  which are needed for scientific computing and visualization in the respective domain. """
 
-toolchain = {'name': 'goolf', 'version': '1.4.10'} # ie. build against the GNU compilers & OpenMPI stack
+toolchain = {'name': 'goolf', 'version': '1.4.10'}  # ie. build against the GNU compilers & OpenMPI stack
 
 dependencies = [
     ('ALLPATHS-LG', '46968'),
@@ -33,7 +33,7 @@ dependencies = [
     ('Bowtie2', '2.0.2'),
     ('bam2fastq', '1.1.0'),
     ('biodeps', '1.6'),
-#    ('CD-HIT', '4.5.4', '-2011-03-07'),
+    #    ('CD-HIT', '4.5.4', '-2011-03-07'),
     ('ClustalW2', '2.1'),
     ('Cufflinks', '2.0.2'),
     ('EMBOSS', '6.5.7'),
@@ -57,7 +57,7 @@ dependencies = [
     ('NEURON', '7.2'),
     ('Oases', '0.2.08'),
     ('PAML', '4.7'),
-#    ('PLINK', '1.07'),
+    #    ('PLINK', '1.07'),
     ('Pasha', '1.0.3'),
     ('Primer3', '2.3.0'),
     ('RAxML', '7.7.5', '-hybrid-sse3'),
diff --git a/easybuild/easyconfigs/h/HPCBIOS_Bioinfo/HPCBIOS_Bioinfo-20130829-ictce-5.3.0.eb b/easybuild/easyconfigs/h/HPCBIOS_Bioinfo/HPCBIOS_Bioinfo-20130829-ictce-5.3.0.eb
index e1d3fd7aa1b0356dd97b50a1d98f317b3922fe3c..a420531caeabaa0c752c7b91d7bc73128d98fc7f 100644
--- a/easybuild/easyconfigs/h/HPCBIOS_Bioinfo/HPCBIOS_Bioinfo-20130829-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/h/HPCBIOS_Bioinfo/HPCBIOS_Bioinfo-20130829-ictce-5.3.0.eb
@@ -19,10 +19,10 @@ homepage = 'http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-94.html'
 description = """Bioinformatics & Computational Biology productivity environment includes a set of HPC tools,
  which are needed for scientific computing and visualization in the respective domain. """
 
-toolchain = {'name': 'ictce', 'version': '5.3.0'} # ie. build against the INTEL compilers & MPI stack / March 2013
+toolchain = {'name': 'ictce', 'version': '5.3.0'}  # ie. build against the INTEL compilers & MPI stack / March 2013
 
 dependencies = [
-#    ('ALLPATHS-LG', '46968'),
+    #    ('ALLPATHS-LG', '46968'),
     ('AMOS', '3.1.0'),
     ('BFAST', '0.7.0a'),
     ('BLAST+', '2.2.28', '-Python-2.7.3'),
@@ -43,7 +43,7 @@ dependencies = [
     ('GLIMMER', '3.02b'),
     ('GROMACS', '4.6.1', '-hybrid'),
     ('HMMER', '3.0'),
-#    ('HH-suite', '2.0.16'),
+    #    ('HH-suite', '2.0.16'),
     ('Infernal', '1.1rc1'),
     ('libgtextutils', '0.6.1'),
     ('libharu', '2.2.0'),
diff --git a/easybuild/easyconfigs/h/HPCBIOS_LifeSciences/HPCBIOS_LifeSciences-20130829-goolf-1.4.10.eb b/easybuild/easyconfigs/h/HPCBIOS_LifeSciences/HPCBIOS_LifeSciences-20130829-goolf-1.4.10.eb
index 3925d6593373142e00c8c96d7106fffe961163ae..ac9bda6d5df60cbb34ad2f5e13c0c0e5405c3ffb 100644
--- a/easybuild/easyconfigs/h/HPCBIOS_LifeSciences/HPCBIOS_LifeSciences-20130829-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/h/HPCBIOS_LifeSciences/HPCBIOS_LifeSciences-20130829-goolf-1.4.10.eb
@@ -31,7 +31,7 @@ dependencies = [
     ('HMMER', '3.0'),
     ('MrBayes', '3.1.2'),
     ('mpiBLAST', '1.6.0'),
-#     ('Rosetta', '3.5'),
+    #     ('Rosetta', '3.5'),
 ]
 
 moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/h/HPCBIOS_LifeSciences/HPCBIOS_LifeSciences-20130829-ictce-5.3.0.eb b/easybuild/easyconfigs/h/HPCBIOS_LifeSciences/HPCBIOS_LifeSciences-20130829-ictce-5.3.0.eb
index fc1b20fc8e7ea913ff324a432680086e0b72b3c4..a4a4c517a0d8e9c63bbfd01c998cb65476fb9782 100644
--- a/easybuild/easyconfigs/h/HPCBIOS_LifeSciences/HPCBIOS_LifeSciences-20130829-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/h/HPCBIOS_LifeSciences/HPCBIOS_LifeSciences-20130829-ictce-5.3.0.eb
@@ -31,7 +31,7 @@ dependencies = [
     ('HMMER', '3.0'),
     ('MrBayes', '3.1.2'),
     ('mpiBLAST', '1.6.0'),
-#     ('Rosetta', '3.5'),
+    #     ('Rosetta', '3.5'),
 ]
 
 moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/h/HPCBIOS_Math/HPCBIOS_Math-20130829-ictce-5.3.0.eb b/easybuild/easyconfigs/h/HPCBIOS_Math/HPCBIOS_Math-20130829-ictce-5.3.0.eb
index b2b1287193dd38e2f262d1adc85113ef5f4fc1bc..53cb50514fe45c529df44c6dbad251c1525acd43 100644
--- a/easybuild/easyconfigs/h/HPCBIOS_Math/HPCBIOS_Math-20130829-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/h/HPCBIOS_Math/HPCBIOS_Math-20130829-ictce-5.3.0.eb
@@ -23,9 +23,9 @@ description = """Common Set of Open Source Math Libraries includes a set of HPC
 toolchain = {'name': 'ictce', 'version': '5.3.0'}
 
 dependencies = [
-  ('PETSc', '3.3-p2', '-Python-2.7.3'),
-  ('GSL', '1.15'),
-  ('SPRNG', '2.0b'),
+    ('PETSc', '3.3-p2', '-Python-2.7.3'),
+    ('GSL', '1.15'),
+    ('SPRNG', '2.0b'),
 ]
 
 moduleclass = 'math'
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 0ad29d6c94f28bb4ea10c0ff8dd21226a7770a96..96acd937257084be9791e3c65ac63861d1f15959 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
@@ -15,4 +15,3 @@ source_urls = ['http://www.netlib.org/benchmark/%(namelower)s']
 patches = ['HPL_parallel-make.patch']
 
 moduleclass = 'tools'
-
diff --git a/easybuild/easyconfigs/h/HarfBuzz/HarfBuzz-0.9.35-intel-2014b.eb b/easybuild/easyconfigs/h/HarfBuzz/HarfBuzz-0.9.35-intel-2014b.eb
index da1d4ca30fcd770baba3dce82244284f0a31d3de..473cec461ab62c9d121d9dfcfa52f35142e7976e 100644
--- a/easybuild/easyconfigs/h/HarfBuzz/HarfBuzz-0.9.35-intel-2014b.eb
+++ b/easybuild/easyconfigs/h/HarfBuzz/HarfBuzz-0.9.35-intel-2014b.eb
@@ -12,8 +12,8 @@ source_urls = ['http://www.freedesktop.org/software/harfbuzz/release/']
 sources = [SOURCELOWER_TAR_BZ2]
 
 dependencies = [
-     ('cairo', '1.12.18'),
-     ('GObject-Introspection', '1.42.0'),
+    ('cairo', '1.12.18'),
+    ('GObject-Introspection', '1.42.0'),
 ]
 
 patches = ['HarfBuzz-%(version)s_config.patch']
diff --git a/easybuild/easyconfigs/h/HarfBuzz/HarfBuzz-1.0.1-intel-2015a.eb b/easybuild/easyconfigs/h/HarfBuzz/HarfBuzz-1.0.1-intel-2015a.eb
index 816c289c555ce0e6c16c43220b2d7829942a6a49..8537af8ca5cf98bb96e012279b708718bffe66ec 100644
--- a/easybuild/easyconfigs/h/HarfBuzz/HarfBuzz-1.0.1-intel-2015a.eb
+++ b/easybuild/easyconfigs/h/HarfBuzz/HarfBuzz-1.0.1-intel-2015a.eb
@@ -12,8 +12,8 @@ source_urls = ['http://www.freedesktop.org/software/harfbuzz/release/']
 sources = [SOURCELOWER_TAR_BZ2]
 
 dependencies = [
-     ('cairo', '1.14.2'),
-     ('GObject-Introspection', '1.44.0'),
+    ('cairo', '1.14.2'),
+    ('GObject-Introspection', '1.44.0'),
 ]
 
 configopts = '--with-gobject --enable-introspection=yes '
diff --git a/easybuild/easyconfigs/h/HarfBuzz/HarfBuzz-1.1.0-intel-2015b.eb b/easybuild/easyconfigs/h/HarfBuzz/HarfBuzz-1.1.0-intel-2015b.eb
index 15e2c94d10340a73462f7d621a9774315d01eae1..4669cfc27fb9790f67457a4258804d97a2f1036f 100644
--- a/easybuild/easyconfigs/h/HarfBuzz/HarfBuzz-1.1.0-intel-2015b.eb
+++ b/easybuild/easyconfigs/h/HarfBuzz/HarfBuzz-1.1.0-intel-2015b.eb
@@ -12,8 +12,8 @@ source_urls = ['http://www.freedesktop.org/software/harfbuzz/release/']
 sources = [SOURCELOWER_TAR_BZ2]
 
 dependencies = [
-     ('cairo', '1.14.4'),
-     ('GObject-Introspection', '1.47.1'),
+    ('cairo', '1.14.4'),
+    ('GObject-Introspection', '1.47.1'),
 ]
 
 configopts = '--with-gobject --enable-introspection=yes '
diff --git a/easybuild/easyconfigs/h/HarfBuzz/HarfBuzz-1.1.3-intel-2016a.eb b/easybuild/easyconfigs/h/HarfBuzz/HarfBuzz-1.1.3-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..050ccb78582b68da1600c975effd2ef2ca17e806
--- /dev/null
+++ b/easybuild/easyconfigs/h/HarfBuzz/HarfBuzz-1.1.3-intel-2016a.eb
@@ -0,0 +1,34 @@
+easyblock = 'ConfigureMake'
+
+name = 'HarfBuzz'
+version = '1.1.3'
+
+homepage = 'http://www.freedesktop.org/wiki/Software/HarfBuzz'
+description = """HarfBuzz is an OpenType text shaping engine."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+source_urls = ['http://www.freedesktop.org/software/harfbuzz/release/']
+sources = [SOURCELOWER_TAR_BZ2]
+
+glibver = '2.47.5'
+dependencies = [
+    ('GLib', glibver),
+    ('cairo', '1.14.6'),
+    ('freetype', '2.6.2'),
+    ('GObject-Introspection', '1.47.1')
+]
+
+configopts = "--enable-introspection=yes --with-gobject=yes --enable-static --enable-shared --with-cairo "
+
+modextrapaths = {
+    'GI_TYPELIB_PATH': 'share',
+    'XDG_DATA_DIRS': 'share',
+}
+
+sanity_check_paths = {
+    'files': ['lib/libharfbuzz.%s' % SHLIB_EXT, 'bin/hb-view'],
+    'dirs': []
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/h/Hypre/Hypre-2.8.0b-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/h/Hypre/Hypre-2.8.0b-goalf-1.1.0-no-OFED.eb
index 964e73f35c3d38fbc63ca2160acb35645d44af55..8348598dca6ce17646f1e1cd245dc8d0e0913ad6 100644
--- a/easybuild/easyconfigs/h/Hypre/Hypre-2.8.0b-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/h/Hypre/Hypre-2.8.0b-goalf-1.1.0-no-OFED.eb
@@ -15,8 +15,8 @@ sources = [SOURCELOWER_TAR_GZ]
 start_dir = "src"
 
 sanity_check_paths = {
-                      'files': ['lib/libHYPRE.a'],
-                      'dirs': ['include']
-                     }
+    'files': ['lib/libHYPRE.a'],
+    'dirs': ['include']
+}
 
 moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/h/Hypre/Hypre-2.8.0b-goolf-1.4.10.eb b/easybuild/easyconfigs/h/Hypre/Hypre-2.8.0b-goolf-1.4.10.eb
index 57e599416bf75f22f7f93007e823bfb375ce3881..8022f1e636d6567bc823d769ca82b29ddf332a4d 100644
--- a/easybuild/easyconfigs/h/Hypre/Hypre-2.8.0b-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/h/Hypre/Hypre-2.8.0b-goolf-1.4.10.eb
@@ -14,8 +14,8 @@ sources = [SOURCELOWER_TAR_GZ]
 start_dir = "src"
 
 sanity_check_paths = {
-                      'files': ['lib/libHYPRE.a'],
-                      'dirs': ['include']
-                     }
+    'files': ['lib/libHYPRE.a'],
+    'dirs': ['include']
+}
 
 moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/h/Hypre/Hypre-2.8.0b-ictce-4.0.6.eb b/easybuild/easyconfigs/h/Hypre/Hypre-2.8.0b-ictce-4.0.6.eb
index 1e62113c7c8ebf6bd8b90db86ce5d5ad6ff5a355..4d7372a276e9ba33731f1b4055b3731388002bc2 100644
--- a/easybuild/easyconfigs/h/Hypre/Hypre-2.8.0b-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/h/Hypre/Hypre-2.8.0b-ictce-4.0.6.eb
@@ -15,8 +15,8 @@ sources = [SOURCELOWER_TAR_GZ]
 start_dir = "src"
 
 sanity_check_paths = {
-                      'files': ['lib/libHYPRE.a'],
-                      'dirs': ['include']
-                     }
+    'files': ['lib/libHYPRE.a'],
+    'dirs': ['include']
+}
 
 moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/h/Hypre/Hypre-2.8.0b-ictce-5.3.0.eb b/easybuild/easyconfigs/h/Hypre/Hypre-2.8.0b-ictce-5.3.0.eb
index c7c83dd59eb46d83c188aa24ff68861bd1a7dc2d..a01d7fbee86abe4e22a80acbb4eb88892ee53178 100644
--- a/easybuild/easyconfigs/h/Hypre/Hypre-2.8.0b-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/h/Hypre/Hypre-2.8.0b-ictce-5.3.0.eb
@@ -16,8 +16,8 @@ sources = [SOURCELOWER_TAR_GZ]
 start_dir = "src"
 
 sanity_check_paths = {
-                      'files': ['lib/libHYPRE.a'],
-                      'dirs': ['include']
-                     }
+    'files': ['lib/libHYPRE.a'],
+    'dirs': ['include']
+}
 
 moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/h/h5py/h5py-2.2.1-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/h/h5py/h5py-2.2.1-goolf-1.4.10-Python-2.7.3.eb
index 9852693c1580b5bcca42c37d7cee17cdd71eb5ce..c9f750bf701fa7a6c0a9e089bac71d38bf29b996 100644
--- a/easybuild/easyconfigs/h/h5py/h5py-2.2.1-goolf-1.4.10-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/h/h5py/h5py-2.2.1-goolf-1.4.10-Python-2.7.3.eb
@@ -26,7 +26,7 @@ dependencies = [
     (python, pythonver),
     ('HDF5', '1.8.12', '-zlib-1.2.7'),
     ('mpi4py', '1.3', versionsuffix),  # required for MPI support
-    ('Cython', '0.19.1', versionsuffix), # required to build h5py with MPI support
+    ('Cython', '0.19.1', versionsuffix),  # required to build h5py with MPI support
 ]
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/h/h5py/h5py-2.2.1-ictce-4.1.13-Python-2.7.3.eb b/easybuild/easyconfigs/h/h5py/h5py-2.2.1-ictce-4.1.13-Python-2.7.3.eb
index 7f4bdd782b9df3a9aa303f2b97efb61e3c3c7935..eb868b185c4586ac381b576191f6d3ef2f11022b 100644
--- a/easybuild/easyconfigs/h/h5py/h5py-2.2.1-ictce-4.1.13-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/h/h5py/h5py-2.2.1-ictce-4.1.13-Python-2.7.3.eb
@@ -26,7 +26,7 @@ dependencies = [
     (python, pythonver),
     ('HDF5', '1.8.12', '-zlib-1.2.7'),
     ('mpi4py', '1.3', versionsuffix),  # required for MPI support
-    ('Cython', '0.19.1', versionsuffix), # required to build h5py with MPI support
+    ('Cython', '0.19.1', versionsuffix),  # required to build h5py with MPI support
 ]
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/h/h5py/h5py-2.5.0-intel-2015a-Python-2.7.9.eb b/easybuild/easyconfigs/h/h5py/h5py-2.5.0-intel-2015a-Python-2.7.9.eb
index 41181b753b862cabffe2dfbb31616f77a2cfeb4a..4bd7c5cc0eaaeb1fbe1f02064bf1764228e7269b 100644
--- a/easybuild/easyconfigs/h/h5py/h5py-2.5.0-intel-2015a-Python-2.7.9.eb
+++ b/easybuild/easyconfigs/h/h5py/h5py-2.5.0-intel-2015a-Python-2.7.9.eb
@@ -25,6 +25,7 @@ prebuildopts = ' python setup.py configure --mpi --hdf5=$EBROOTHDF5 && '
 dependencies = [
     (python, pyver),
     ('HDF5', '1.8.14'),
+    ('pkgconfig', '1.1.0', '-Python-%(pyver)s'),
 ]
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/h/h5py/h5py-2.5.0-intel-2015b-Python-2.7.10-HDF5-1.8.15-patch1-serial.eb b/easybuild/easyconfigs/h/h5py/h5py-2.5.0-intel-2015b-Python-2.7.10-HDF5-1.8.15-patch1-serial.eb
index 8cfa9b21c9334a707585a8ec2e4924d7621fe386..f070e8c2260357de11cfbdabe63ef51e5e89f9c6 100644
--- a/easybuild/easyconfigs/h/h5py/h5py-2.5.0-intel-2015b-Python-2.7.10-HDF5-1.8.15-patch1-serial.eb
+++ b/easybuild/easyconfigs/h/h5py/h5py-2.5.0-intel-2015b-Python-2.7.10-HDF5-1.8.15-patch1-serial.eb
@@ -22,6 +22,7 @@ versionsuffix = '-Python-%s-HDF5-%s-serial' % (pyver, hdf5ver)
 dependencies = [
     ('Python', pyver),
     ('HDF5', hdf5ver),
+    ('pkgconfig', '1.1.0', '-Python-%(pyver)s'),
 ]
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/h/h5py/h5py-2.5.0-intel-2015b-Python-2.7.10-HDF5-1.8.15-patch1.eb b/easybuild/easyconfigs/h/h5py/h5py-2.5.0-intel-2015b-Python-2.7.10-HDF5-1.8.15-patch1.eb
index d9106c2244978870521f148d089628445a1f95a0..bb6d007d2c7d099319ac40c403e10d95c9a87d3e 100644
--- a/easybuild/easyconfigs/h/h5py/h5py-2.5.0-intel-2015b-Python-2.7.10-HDF5-1.8.15-patch1.eb
+++ b/easybuild/easyconfigs/h/h5py/h5py-2.5.0-intel-2015b-Python-2.7.10-HDF5-1.8.15-patch1.eb
@@ -25,6 +25,7 @@ prebuildopts = ' python setup.py configure --mpi --hdf5=$EBROOTHDF5 && '
 dependencies = [
     ('Python', pyver),
     ('HDF5', hdf5ver),
+    ('pkgconfig', '1.1.0', '-Python-%(pyver)s'),
 ]
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/h/h5py/h5py-2.5.0-intel-2015b-Python-2.7.11-HDF5-1.8.16.eb b/easybuild/easyconfigs/h/h5py/h5py-2.5.0-intel-2015b-Python-2.7.11-HDF5-1.8.16.eb
new file mode 100644
index 0000000000000000000000000000000000000000..eb3653329e84e2a831b13199e75131c0698ab8f0
--- /dev/null
+++ b/easybuild/easyconfigs/h/h5py/h5py-2.5.0-intel-2015b-Python-2.7.11-HDF5-1.8.16.eb
@@ -0,0 +1,34 @@
+easyblock = "PythonPackage"
+
+name = 'h5py'
+version = '2.5.0'
+
+homepage = 'http://www.h5py.org/'
+description = """HDF5 for Python (h5py) is a general-purpose Python interface to the Hierarchical Data Format library,
+ version 5. HDF5 is a versatile, mature scientific software library designed for the fast, flexible storage of enormous
+ amounts of data."""
+
+toolchain = {'name': 'intel', 'version': '2015b'}
+toolchainopts = {'usempi': True}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+hdf5ver = '1.8.16'
+versionsuffix = '-Python-%%(pyver)s-HDF5-%s' % hdf5ver
+
+# to really use mpi enabled hdf5 we now seem to need a configure step
+prebuildopts = ' python setup.py configure --mpi --hdf5=$EBROOTHDF5 && '
+
+dependencies = [
+    ('Python', '2.7.11'),
+    ('HDF5', hdf5ver),
+    ('pkgconfig', '1.1.0', '-Python-%(pyver)s'),
+]
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%(pyshortver)s/site-packages/'],
+}
+
+moduleclass = 'data'
diff --git a/easybuild/easyconfigs/h/h5py/h5py-2.5.0-intel-2016a-Python-2.7.11-HDF5-1.8.16.eb b/easybuild/easyconfigs/h/h5py/h5py-2.5.0-intel-2016a-Python-2.7.11-HDF5-1.8.16.eb
new file mode 100644
index 0000000000000000000000000000000000000000..40b2a15fa2d79579f7a6b5715d454a50ccbbf1dd
--- /dev/null
+++ b/easybuild/easyconfigs/h/h5py/h5py-2.5.0-intel-2016a-Python-2.7.11-HDF5-1.8.16.eb
@@ -0,0 +1,34 @@
+easyblock = "PythonPackage"
+
+name = 'h5py'
+version = '2.5.0'
+
+homepage = 'http://www.h5py.org/'
+description = """HDF5 for Python (h5py) is a general-purpose Python interface to the Hierarchical Data Format library,
+ version 5. HDF5 is a versatile, mature scientific software library designed for the fast, flexible storage of enormous
+ amounts of data."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+toolchainopts = {'usempi': True}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+hdf5ver = '1.8.16'
+versionsuffix = '-Python-%%(pyver)s-HDF5-%s' % hdf5ver
+
+# to really use mpi enabled hdf5 we now seem to need a configure step
+prebuildopts = ' python setup.py configure --mpi --hdf5=$EBROOTHDF5 && '
+
+dependencies = [
+    ('Python', '2.7.11'),
+    ('HDF5', hdf5ver),
+    ('pkgconfig', '1.1.0', '-Python-%(pyver)s'),
+]
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%(pyshortver)s/site-packages/'],
+}
+
+moduleclass = 'data'
diff --git a/easybuild/easyconfigs/h/h5utils/h5utils-1.12.1-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/h/h5utils/h5utils-1.12.1-goalf-1.1.0-no-OFED.eb
index c8bbf3c141ce322fc4afd23c07c16bb09e709162..a9fe70521e38038fe8f3e3f0478deb68a619a8e6 100644
--- a/easybuild/easyconfigs/h/h5utils/h5utils-1.12.1-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/h/h5utils/h5utils-1.12.1-goalf-1.1.0-no-OFED.eb
@@ -18,11 +18,11 @@ toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
 toolchainopts = {'usempi': True}
 
 dependencies = [
-                ('zlib', '1.2.7'),
-                ('libpng', '1.5.11'),
-                ('libmatheval', '1.1.8'),
-                ('HDF5', '1.8.7'),
-               ]
+    ('zlib', '1.2.7'),
+    ('libpng', '1.5.11'),
+    ('libmatheval', '1.1.8'),
+    ('HDF5', '1.8.7'),
+]
 
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/h/h5utils/h5utils-1.12.1-goolf-1.4.10.eb b/easybuild/easyconfigs/h/h5utils/h5utils-1.12.1-goolf-1.4.10.eb
index 2c3932e7b7e9860908d2b2199c233fe356149b1f..2efbe0acabd470b26af0e7db9aced31f25ed6f76 100644
--- a/easybuild/easyconfigs/h/h5utils/h5utils-1.12.1-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/h/h5utils/h5utils-1.12.1-goolf-1.4.10.eb
@@ -16,11 +16,11 @@ toolchain = {'name': 'goolf', 'version': '1.4.10'}
 toolchainopts = {'usempi': True}
 
 dependencies = [
-                ('zlib', '1.2.7'),
-                ('libpng', '1.5.11'),
-                ('libmatheval', '1.1.8'),
-                ('HDF5', '1.8.7'),
-               ]
+    ('zlib', '1.2.7'),
+    ('libpng', '1.5.11'),
+    ('libmatheval', '1.1.8'),
+    ('HDF5', '1.8.7'),
+]
 
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/h/h5utils/h5utils-1.12.1-ictce-4.0.6.eb b/easybuild/easyconfigs/h/h5utils/h5utils-1.12.1-ictce-4.0.6.eb
index ed7d1cacaa3e1de5ca1c6f85aba0920b354ad377..a75aef9437d7db14ad124315e374ff4d5e2fcbac 100644
--- a/easybuild/easyconfigs/h/h5utils/h5utils-1.12.1-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/h/h5utils/h5utils-1.12.1-ictce-4.0.6.eb
@@ -17,11 +17,11 @@ toolchain = {'name': 'ictce', 'version': '4.0.6'}
 toolchainopts = {'usempi': True}
 
 dependencies = [
-                ('zlib', '1.2.7'),
-                ('libpng', '1.5.11'),
-                ('libmatheval', '1.1.8'),
-                ('HDF5', '1.8.7'),
-               ]
+    ('zlib', '1.2.7'),
+    ('libpng', '1.5.11'),
+    ('libmatheval', '1.1.8'),
+    ('HDF5', '1.8.7'),
+]
 
 sanity_check_paths = {
     'files': ['bin/%s' % x for x in ['h5fromtxt', 'h5math', 'h5topng', 'h5totxt', 'h5tovtk']],
diff --git a/easybuild/easyconfigs/h/h5utils/h5utils-1.12.1-ictce-5.3.0.eb b/easybuild/easyconfigs/h/h5utils/h5utils-1.12.1-ictce-5.3.0.eb
index 975690f50fde970d48d2f5fadcfa069d31bc7a6f..09424f6b1b6c5faa243e38c8292a11c17e900f9f 100644
--- a/easybuild/easyconfigs/h/h5utils/h5utils-1.12.1-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/h/h5utils/h5utils-1.12.1-ictce-5.3.0.eb
@@ -18,11 +18,11 @@ toolchain = {'name': 'ictce', 'version': '5.3.0'}
 toolchainopts = {'usempi': True}
 
 dependencies = [
-                ('zlib', '1.2.7'),
-                ('libpng', '1.5.11'),
-                ('libmatheval', '1.1.8'),
-                ('HDF5', '1.8.7'),
-               ]
+    ('zlib', '1.2.7'),
+    ('libpng', '1.5.11'),
+    ('libmatheval', '1.1.8'),
+    ('HDF5', '1.8.7'),
+]
 
 sanity_check_paths = {
     'files': ['bin/%s' % x for x in ['h5fromtxt', 'h5math', 'h5topng', 'h5totxt', 'h5tovtk']],
diff --git a/easybuild/easyconfigs/h/hanythingondemand/hanythingondemand-2.2.1-intel-2015a-Python-2.7.9.eb b/easybuild/easyconfigs/h/hanythingondemand/hanythingondemand-2.2.1-intel-2015a-Python-2.7.9.eb
index 241e630c3511382a15e91c6a4591d50c9f813062..9272f98ff5844cc20f84e07fb940380ea9ed819c 100644
--- a/easybuild/easyconfigs/h/hanythingondemand/hanythingondemand-2.2.1-intel-2015a-Python-2.7.9.eb
+++ b/easybuild/easyconfigs/h/hanythingondemand/hanythingondemand-2.2.1-intel-2015a-Python-2.7.9.eb
@@ -19,7 +19,7 @@ pythonver = '2.7.9'
 pythonshortver = '.'.join(pythonver.split('.')[:2])
 versionsuffix = '-%s-%s' % (python, pythonver)
 
-# a Python version with mpi4py and pbs_python (vsc.fancylogger) is required at runtime
+# a Python version with mpi4py and pbs_python (vsc.utils.fancylogger) is required at runtime
 dependencies = [
     (python, pythonver),
     ('pbs_python', '4.6.0', versionsuffix),
diff --git a/easybuild/easyconfigs/h/hanythingondemand/hanythingondemand-2.2.2-intel-2015a-Python-2.7.9.eb b/easybuild/easyconfigs/h/hanythingondemand/hanythingondemand-2.2.2-intel-2015a-Python-2.7.9.eb
index f6063d9ec35a143e9b23bae2bc733ae1d1949d8f..a096633f0b1e4bc3555054d39894800d1ac002c4 100644
--- a/easybuild/easyconfigs/h/hanythingondemand/hanythingondemand-2.2.2-intel-2015a-Python-2.7.9.eb
+++ b/easybuild/easyconfigs/h/hanythingondemand/hanythingondemand-2.2.2-intel-2015a-Python-2.7.9.eb
@@ -19,7 +19,7 @@ pythonver = '2.7.9'
 pythonshortver = '.'.join(pythonver.split('.')[:2])
 versionsuffix = '-%s-%s' % (python, pythonver)
 
-# a Python version with mpi4py and pbs_python (vsc.fancylogger) is required at runtime
+# a Python version with mpi4py and pbs_python (vsc.utils.fancylogger) is required at runtime
 dependencies = [
     (python, pythonver),
     ('pbs_python', '4.6.0', versionsuffix),
diff --git a/easybuild/easyconfigs/h/hanythingondemand/hanythingondemand-2.2.3-intel-2015a-Python-2.7.9.eb b/easybuild/easyconfigs/h/hanythingondemand/hanythingondemand-2.2.3-intel-2015a-Python-2.7.9.eb
index 9182229d2c9e1f13e0d42aaf6cd73d6df89c6bc2..c0a03ce83e57dc6b32c09fc19107d0230bb1f7a3 100644
--- a/easybuild/easyconfigs/h/hanythingondemand/hanythingondemand-2.2.3-intel-2015a-Python-2.7.9.eb
+++ b/easybuild/easyconfigs/h/hanythingondemand/hanythingondemand-2.2.3-intel-2015a-Python-2.7.9.eb
@@ -19,7 +19,7 @@ pythonver = '2.7.9'
 pythonshortver = '.'.join(pythonver.split('.')[:2])
 versionsuffix = '-%s-%s' % (python, pythonver)
 
-# a Python version with mpi4py and pbs_python (vsc.fancylogger) is required at runtime
+# a Python version with mpi4py and pbs_python (vsc.utils.fancylogger) is required at runtime
 dependencies = [
     (python, pythonver),
     ('pbs_python', '4.6.0', versionsuffix),
diff --git a/easybuild/easyconfigs/h/hanythingondemand/hanythingondemand-2.2.4-intel-2015a-Python-2.7.9.eb b/easybuild/easyconfigs/h/hanythingondemand/hanythingondemand-2.2.4-intel-2015a-Python-2.7.9.eb
index 73433b308159d427ef171befba8b28610014dbe4..b6761f74452293996a6bed9c1c0af68e7cb20399 100644
--- a/easybuild/easyconfigs/h/hanythingondemand/hanythingondemand-2.2.4-intel-2015a-Python-2.7.9.eb
+++ b/easybuild/easyconfigs/h/hanythingondemand/hanythingondemand-2.2.4-intel-2015a-Python-2.7.9.eb
@@ -19,7 +19,7 @@ pythonver = '2.7.9'
 pythonshortver = '.'.join(pythonver.split('.')[:2])
 versionsuffix = '-%s-%s' % (python, pythonver)
 
-# a Python version with mpi4py and pbs_python (vsc.fancylogger) is required at runtime
+# a Python version with mpi4py and pbs_python (vsc.utils.fancylogger) is required at runtime
 dependencies = [
     (python, pythonver),
     ('pbs_python', '4.6.0', versionsuffix),
diff --git a/easybuild/easyconfigs/h/htop/htop-2.0.0.eb b/easybuild/easyconfigs/h/htop/htop-2.0.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..cadc02fadc298e9991d9d132795fd3e2b5f8694f
--- /dev/null
+++ b/easybuild/easyconfigs/h/htop/htop-2.0.0.eb
@@ -0,0 +1,21 @@
+easyblock = 'ConfigureMake'
+
+name = 'htop'
+version = '2.0.0'
+
+homepage = 'http://hisham.hm/htop/'
+description = """An interactive process viewer for Unix"""
+
+toolchain = {'name': 'dummy', 'version': ''}
+
+source_urls = ['http://hisham.hm/htop/releases/%(version)s/']
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [('ncurses', '6.0')]
+
+sanity_check_paths = {
+    'files': ['bin/htop'],
+    'dirs': ['share'],
+}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/h/hwloc/hwloc-1.10.0-iccifort-2015.1.133-GCC-4.9.2.eb b/easybuild/easyconfigs/h/hwloc/hwloc-1.10.0-iccifort-2015.1.133-GCC-4.9.2.eb
index 6adec23e7104d57098d8b5e48ca9b961af8da3d6..3ecf13cb7d26ee7a46bcbccc59f68b97232356d9 100644
--- a/easybuild/easyconfigs/h/hwloc/hwloc-1.10.0-iccifort-2015.1.133-GCC-4.9.2.eb
+++ b/easybuild/easyconfigs/h/hwloc/hwloc-1.10.0-iccifort-2015.1.133-GCC-4.9.2.eb
@@ -17,4 +17,3 @@ source_urls = ['http://www.open-mpi.org/software/hwloc/v%(version_major_minor)s/
 sources = [SOURCE_TAR_GZ]
 
 moduleclass = 'system'
-
diff --git a/easybuild/easyconfigs/h/hwloc/hwloc-1.10.0-iccifort-2015.2.164-GCC-4.9.2.eb b/easybuild/easyconfigs/h/hwloc/hwloc-1.10.0-iccifort-2015.2.164-GCC-4.9.2.eb
index 6a875c1d323b57fa49a66b1698c9ab169f83e8d0..c0454d96329c395a280bd032ee65c63bfe813c76 100644
--- a/easybuild/easyconfigs/h/hwloc/hwloc-1.10.0-iccifort-2015.2.164-GCC-4.9.2.eb
+++ b/easybuild/easyconfigs/h/hwloc/hwloc-1.10.0-iccifort-2015.2.164-GCC-4.9.2.eb
@@ -17,4 +17,3 @@ source_urls = ['http://www.open-mpi.org/software/hwloc/v%(version_major_minor)s/
 sources = [SOURCE_TAR_GZ]
 
 moduleclass = 'system'
-
diff --git a/easybuild/easyconfigs/h/hwloc/hwloc-1.11.1-GCC-4.9.3.eb b/easybuild/easyconfigs/h/hwloc/hwloc-1.11.1-GCC-4.9.3.eb
index a63d6bae6e7dc5ff9f0c2c800dad7f7b8a2a2517..4d49031a3a4a897bf3a9834da7e7c796abe11116 100644
--- a/easybuild/easyconfigs/h/hwloc/hwloc-1.11.1-GCC-4.9.3.eb
+++ b/easybuild/easyconfigs/h/hwloc/hwloc-1.11.1-GCC-4.9.3.eb
@@ -21,4 +21,3 @@ dependencies = [('numactl', '2.0.11')]
 configopts = "--enable-libnuma=$EBROOTNUMACTL"
 
 moduleclass = 'system'
-
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 50bcad92f396814072303d122c19f40ac85fc7c6..d803930b96c3f4386b5c5815b7db3b09b2f8d2ef 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
@@ -21,4 +21,3 @@ source_urls = ['http://www.open-mpi.org/software/hwloc/v%(version_major_minor)s/
 sources = [SOURCE_TAR_GZ]
 
 moduleclass = 'system'
-
diff --git a/easybuild/easyconfigs/h/hwloc/hwloc-1.11.2-GCC-4.9.3-2.25.eb b/easybuild/easyconfigs/h/hwloc/hwloc-1.11.2-GCC-4.9.3-2.25.eb
index dd384c19f8882c8b8ab8b2369a62e43a3744abb4..0af84a15f7c3684590e672f1cd8edeec75634169 100644
--- a/easybuild/easyconfigs/h/hwloc/hwloc-1.11.2-GCC-4.9.3-2.25.eb
+++ b/easybuild/easyconfigs/h/hwloc/hwloc-1.11.2-GCC-4.9.3-2.25.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.9.3-2.25'}
-  
+
 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-iccifort-2013_sp1.4.211.eb b/easybuild/easyconfigs/h/hwloc/hwloc-1.9-iccifort-2013_sp1.4.211.eb
index 528befdb9af0c1e277656fd08222686850b56194..c4ebd968ce52902297e78e3297e81ada3e860666 100644
--- a/easybuild/easyconfigs/h/hwloc/hwloc-1.9-iccifort-2013_sp1.4.211.eb
+++ b/easybuild/easyconfigs/h/hwloc/hwloc-1.9-iccifort-2013_sp1.4.211.eb
@@ -17,4 +17,3 @@ source_urls = ['http://www.open-mpi.org/software/hwloc/v%(version_major_minor)s/
 sources = [SOURCE_TAR_GZ]
 
 moduleclass = 'system'
-
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 776e9a78462c7021f6184ef769ac43e900904c50..70a1e78b616072617f59452b60faaf654c8d2571 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
@@ -34,7 +34,7 @@ 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"]],
+                                     "idba_ud", "parallel_blat", "idba_tran_test"]],
     'dirs': [""],
 }
 
diff --git a/easybuild/easyconfigs/i/IGV/IGV-2.3.68-Java-1.7.0_80.eb b/easybuild/easyconfigs/i/IGV/IGV-2.3.68-Java-1.7.0_80.eb
new file mode 100644
index 0000000000000000000000000000000000000000..faccbfa2f16a5ec4601089e37631785770dbb3e5
--- /dev/null
+++ b/easybuild/easyconfigs/i/IGV/IGV-2.3.68-Java-1.7.0_80.eb
@@ -0,0 +1,38 @@
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+# Author: Pablo Escobar Lopez
+# sciCORE - University of Basel
+# SIB Swiss Institute of Bioinformatics 
+
+easyblock = 'Tarball'
+
+name = 'IGV'
+version = '2.3.68'
+
+homepage = 'http://www.broadinstitute.org/software/igv/'
+description = """ The Integrative Genomics Viewer (IGV) is a high-performance visualization 
+ tool for interactive exploration of large, integrated genomic datasets. It supports a wide 
+ variety of data types, including array-based and next-generation sequence data, and genomic annotations. """
+
+toolchain = {'name': 'dummy', 'version': ''}
+
+source_urls = ['http://data.broadinstitute.org/igv/projects/downloads/']
+sources = ['%(name)s_%(version)s.zip']
+
+java = 'Java'
+javaver = '1.7.0_80'
+versionsuffix = '-%s-%s' % (java, javaver)
+dependencies = [(java, javaver)]
+
+# add the installation dir to PATH
+modextrapaths = { 
+    'PATH': '',
+}
+
+modloadmsg = """ To execute IGV run igv.sh """
+
+sanity_check_paths = {
+    'files': ["igv.sh"],
+    'dirs': [],
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/i/IGVTools/IGVTools-2.3.68-Java-1.7.0_80.eb b/easybuild/easyconfigs/i/IGVTools/IGVTools-2.3.68-Java-1.7.0_80.eb
new file mode 100644
index 0000000000000000000000000000000000000000..bc16033a08ab3d4e855b1803f2dd3492f4c69c2f
--- /dev/null
+++ b/easybuild/easyconfigs/i/IGVTools/IGVTools-2.3.68-Java-1.7.0_80.eb
@@ -0,0 +1,36 @@
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+# Author: Pablo Escobar Lopez
+# sciCORE - University of Basel
+# SIB Swiss Institute of Bioinformatics 
+
+easyblock = 'Tarball'
+
+name = 'IGVTools'
+version = '2.3.68'
+
+homepage = 'http://www.broadinstitute.org/software/igv/'
+description = """ This package contains command line utilities for preprocessing, 
+ computing feature count density (coverage),  sorting, and indexing data files.
+ See also http://www.broadinstitute.org/software/igv/igvtools_commandline. """
+
+toolchain = {'name': 'dummy', 'version': ''}
+
+source_urls = ['http://data.broadinstitute.org/igv/projects/downloads/']
+sources = ['%(namelower)s_%(version)s.zip']
+
+java = 'Java'
+javaver = '1.7.0_80'
+versionsuffix = '-%s-%s' % (java, javaver)
+dependencies = [(java, javaver)]
+
+# add the installation dir to PATH
+modextrapaths = { 
+    'PATH': '',
+}
+
+sanity_check_paths = {
+    'files': ["igvtools.jar", "igvtools"],
+    'dirs': [],
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/i/IMPUTE2/IMPUTE2-2.3.0_x86_64_dynamic.eb b/easybuild/easyconfigs/i/IMPUTE2/IMPUTE2-2.3.0_x86_64_dynamic.eb
index 0c2d1cc059f006bddc7a05b94fb798a5367e0932..03ab71fb0938194dd8c4586db01bb866c3d7aa8c 100644
--- a/easybuild/easyconfigs/i/IMPUTE2/IMPUTE2-2.3.0_x86_64_dynamic.eb
+++ b/easybuild/easyconfigs/i/IMPUTE2/IMPUTE2-2.3.0_x86_64_dynamic.eb
@@ -29,4 +29,3 @@ modextrapaths = {
 }
 
 moduleclass = 'bio'
-
diff --git a/easybuild/easyconfigs/i/IMPUTE2/IMPUTE2-2.3.0_x86_64_static.eb b/easybuild/easyconfigs/i/IMPUTE2/IMPUTE2-2.3.0_x86_64_static.eb
index 0fb795f7ebb564400e36a11a7e35d953cd58f5a7..ba5278c5407ab2b5b8661243d3ceb01035754f3d 100644
--- a/easybuild/easyconfigs/i/IMPUTE2/IMPUTE2-2.3.0_x86_64_static.eb
+++ b/easybuild/easyconfigs/i/IMPUTE2/IMPUTE2-2.3.0_x86_64_static.eb
@@ -29,4 +29,3 @@ modextrapaths = {
 }
 
 moduleclass = 'bio'
-
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 2f880e46891f84baad303a5866ba983a28805941..da34c32da193b97cabe603aaadcf049c49a58fa7 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
@@ -7,7 +7,7 @@ easyblock = 'MakeCp'
 
 name = "IOR"
 version = "2.10.3"
-versionsuffix= "-mpiio"
+versionsuffix = "-mpiio"
 
 homepage = 'http://sourceforge.net/projects/ior-sio/'
 description = """ The IOR software is used for benchmarking parallel file systems 
@@ -26,7 +26,7 @@ sources = [SOURCE_TGZ]
 buildopts = ' mpiio'
 
 files_to_copy = [(['src/C/IOR'], 'bin'),
-                "README", "RELEASE_LOG", "UNDOCUMENTED_OPTIONS", "USER_GUIDE", "scripts", "testing"]
+                 "README", "RELEASE_LOG", "UNDOCUMENTED_OPTIONS", "USER_GUIDE", "scripts", "testing"]
 
 sanity_check_paths = {
     'files': ["bin/IOR"],
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 ac67b88a09292e8d3b9b37cb175f22727986bad4..7502a94f7139039b50633e00aa3ad0ac5086a84a 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
@@ -7,7 +7,7 @@ easyblock = 'MakeCp'
 
 name = "IOR"
 version = "2.10.3"
-versionsuffix= "-mpiio"
+versionsuffix = "-mpiio"
 
 homepage = 'http://sourceforge.net/projects/ior-sio/'
 description = """ The IOR software is used for benchmarking parallel file systems 
@@ -26,7 +26,7 @@ sources = [SOURCE_TGZ]
 buildopts = ' mpiio'
 
 files_to_copy = [(['src/C/IOR'], 'bin'),
-                "README", "RELEASE_LOG", "UNDOCUMENTED_OPTIONS", "USER_GUIDE", "scripts", "testing"]
+                 "README", "RELEASE_LOG", "UNDOCUMENTED_OPTIONS", "USER_GUIDE", "scripts", "testing"]
 
 sanity_check_paths = {
     'files': ["bin/IOR"],
diff --git a/easybuild/easyconfigs/i/IPython/IPython-1.1.0-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/i/IPython/IPython-1.1.0-goolf-1.4.10-Python-2.7.3.eb
index 92f605169bdefe0d13a2793776b66062185261b6..8f516796f672c20d4cd04a84e929b88b222ea0db 100644
--- a/easybuild/easyconfigs/i/IPython/IPython-1.1.0-goolf-1.4.10-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/i/IPython/IPython-1.1.0-goolf-1.4.10-Python-2.7.3.eb
@@ -37,6 +37,6 @@ sanity_check_paths = {
     'dirs': ['lib/python%s/site-packages/IPython' % pyshortver],
 }
 
-sanity_check_commands = [('iptest','')]
+sanity_check_commands = [('iptest', '')]
 
 moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/i/IPython/IPython-3.1.0-intel-2015a-Python-2.7.9.eb b/easybuild/easyconfigs/i/IPython/IPython-3.1.0-intel-2015a-Python-2.7.9.eb
index 4ddce0d14217ddea9252339d3f412bfbf3096dc5..97bb8abc4463542880ad9bdcf4703627237ec3de 100644
--- a/easybuild/easyconfigs/i/IPython/IPython-3.1.0-intel-2015a-Python-2.7.9.eb
+++ b/easybuild/easyconfigs/i/IPython/IPython-3.1.0-intel-2015a-Python-2.7.9.eb
@@ -40,6 +40,6 @@ sanity_check_paths = {
     'dirs': ['lib/python%s/site-packages/IPython' % pyshortver],
 }
 
-sanity_check_commands = [('iptest','')]
+sanity_check_commands = [('iptest', '')]
 
 moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/i/IPython/IPython-3.2.0-foss-2015a-Python-2.7.9.eb b/easybuild/easyconfigs/i/IPython/IPython-3.2.0-foss-2015a-Python-2.7.9.eb
index ca831cfe277d6b150831f9d9ed43addffeb5ac45..f7ae347c5ebc5059734e908fe3e8770f054187be 100644
--- a/easybuild/easyconfigs/i/IPython/IPython-3.2.0-foss-2015a-Python-2.7.9.eb
+++ b/easybuild/easyconfigs/i/IPython/IPython-3.2.0-foss-2015a-Python-2.7.9.eb
@@ -40,6 +40,6 @@ sanity_check_paths = {
     'dirs': ['lib/python%s/site-packages/IPython' % pyshortver],
 }
 
-sanity_check_commands = [('iptest','')]
+sanity_check_commands = [('iptest', '')]
 
 moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/i/IPython/IPython-3.2.0-intel-2015a-Python-2.7.9.eb b/easybuild/easyconfigs/i/IPython/IPython-3.2.0-intel-2015a-Python-2.7.9.eb
index 5b0893e10be373866c73d86d2eb56554615bc7b7..57149b7b99d5a0a6c72d76855d182e8ca2a8fb40 100644
--- a/easybuild/easyconfigs/i/IPython/IPython-3.2.0-intel-2015a-Python-2.7.9.eb
+++ b/easybuild/easyconfigs/i/IPython/IPython-3.2.0-intel-2015a-Python-2.7.9.eb
@@ -40,6 +40,6 @@ sanity_check_paths = {
     'dirs': ['lib/python%s/site-packages/IPython' % pyshortver],
 }
 
-sanity_check_commands = [('iptest','')]
+sanity_check_commands = [('iptest', '')]
 
 moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/i/IPython/IPython-3.2.3-foss-2015a-Python-2.7.11.eb b/easybuild/easyconfigs/i/IPython/IPython-3.2.3-foss-2015a-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..6a2901ff52a1797d22ba3a8af5a5ae668b2fb4d5
--- /dev/null
+++ b/easybuild/easyconfigs/i/IPython/IPython-3.2.3-foss-2015a-Python-2.7.11.eb
@@ -0,0 +1,90 @@
+easyblock = 'Bundle'
+
+name = 'IPython'
+version = '3.2.3'
+
+homepage = 'http://ipython.org/index.html'
+description = """IPython provides a rich architecture for interactive computing with:
+ Powerful interactive shells (terminal and Qt-based).
+ A browser-based notebook with support for code, text, mathematical expressions, inline plots and other rich media.
+ Support for interactive data visualization and use of GUI toolkits.
+ Flexible, embeddable interpreters to load into your own projects.
+ Easy to use, high performance tools for parallel computing."""
+
+toolchain = {'name': 'foss', 'version': '2015a'}
+
+python = 'Python'
+pyver = '2.7.11'
+pyshortver = '.'.join(pyver.split('.')[:2])
+versionsuffix = '-%s-%s' % (python, pyver)
+
+dependencies = [
+    (python, pyver),
+    ('PyZMQ', '15.2.0', '%s-zmq4' % versionsuffix),
+]
+
+# this is a bundle of Python packages
+exts_defaultclass = 'PythonPackage'
+exts_filter = ("python -c 'import %(ext_name)s'", '')
+
+exts_list = [
+    ('pysqlite', '2.8.1', {
+        'modulename': 'pysqlite2',
+        'source_urls': ['https://pypi.python.org/packages/source/p/pysqlite/'],
+    }),
+    ('requests', '2.9.1', {
+        'source_urls': ['https://pypi.python.org/packages/source/r/requests/'],
+    }),
+    ('Pygments', '2.0.2', {
+        'source_urls': ['https://pypi.python.org/packages/source/P/Pygments/'],
+    }),
+    ('singledispatch', '3.4.0.3', {
+        'source_urls': ['https://pypi.python.org/packages/source/s/singledispatch/'],
+    }),
+    ('backports.ssl_match_hostname', '3.5.0.1', {
+        'source_urls': ['https://pypi.python.org/packages/source/b/backports.ssl_match_hostname/'],
+    }),
+    ('certifi', '2015.11.20.1', {
+        'source_urls': ['https://pypi.python.org/packages/source/c/certifi/'],
+    }),
+    ('backports_abc', '0.4', {
+        'source_urls': ['https://pypi.python.org/packages/source/b/backports_abc/'],
+    }),
+    ('tornado', '4.3', {
+        'source_urls': ['https://pypi.python.org/packages/source/t/tornado/'],
+    }),
+    ('Jinja2', '2.8', {
+        'source_urls': ['https://pypi.python.org/packages/source/J/Jinja2/'],
+    }),
+    ('jsonschema', '2.5.1', {
+        'source_urls': ['https://pypi.python.org/packages/source/j/jsonschema/'],
+    }),
+    ('mistune', '0.7.1', {
+        'source_urls': ['https://pypi.python.org/packages/source/m/mistune/'],
+    }),
+    ('ptyprocess', '0.5', {
+        'source_urls': ['https://pypi.python.org/packages/source/p/ptyprocess/'],
+    }),
+    ('terminado', '0.6', {
+        'source_urls': ['https://pypi.python.org/packages/source/t/terminado/'],
+    }),
+    ('ipython', version, {
+        'source_urls': ['https://pypi.python.org/packages/source/i/ipython/'],
+        'modulename': 'IPython',
+    }),
+]
+
+modextrapaths = {'PYTHONPATH': ['lib/python%s/site-packages' % pyshortver]}
+
+sanity_check_paths = {
+    'files': ['bin/ipython'],
+    'dirs': ['lib/python%s/site-packages/IPython' % pyshortver],
+}
+
+sanity_check_commands = [
+    ('ipython -h', ''),
+    ('ipython notebook --help', ''),
+    ('iptest', ''),
+]
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/i/ImageMagick/ImageMagick-6.9.3-3-goolf-1.4.10.eb b/easybuild/easyconfigs/i/ImageMagick/ImageMagick-6.9.3-3-goolf-1.4.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..8b641aebb3fb7d26671219c614371b582c2eb26f
--- /dev/null
+++ b/easybuild/easyconfigs/i/ImageMagick/ImageMagick-6.9.3-3-goolf-1.4.10.eb
@@ -0,0 +1,40 @@
+easyblock = 'ConfigureMake'
+
+name = 'ImageMagick'
+version = '6.9.3-3'
+
+homepage = 'http://www.imagemagick.org/'
+description = """ImageMagick is a software suite to create, edit, compose, or convert bitmap images"""
+
+toolchain = {'name': 'goolf', 'version': '1.4.10'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = ['https://launchpad.net/imagemagick/main/%(version)s/+download/']
+
+dependencies = [
+    ('bzip2', '1.0.6'),
+    ('freetype', '2.5.0.1'),
+    ('Ghostscript', '9.10'),
+    ('JasPer', '1.900.1'),
+    ('libjpeg-turbo', '1.4.2'),
+    ('LibTIFF', '4.0.3'),
+    ('libX11', '1.6.1'),
+    ('libXext', '1.3.2'),
+    ('libXt', '1.1.4'),
+    ('LittleCMS', '2.7'),
+]
+
+builddependencies = [
+    ('pkg-config', '0.27.1'),
+]
+
+configopts = "--with-gslib --with-x"
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['bin', 'etc/%(name)s-%(version_major)s', 'include/%(name)s-%(version_major)s', 'lib', 'share'],
+}
+
+modextravars = {'MAGICK_HOME': '%(installdir)s'}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/i/Infernal/Infernal-1.1rc1-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/i/Infernal/Infernal-1.1rc1-goalf-1.1.0-no-OFED.eb
index cd6c0100f08f2c509b80b82fc15bc10e391e2247..807ce3ee014df080a94e553bfaf42693b716fe69 100644
--- a/easybuild/easyconfigs/i/Infernal/Infernal-1.1rc1-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/i/Infernal/Infernal-1.1rc1-goalf-1.1.0-no-OFED.eb
@@ -26,9 +26,9 @@ sources = [SOURCELOWER_TAR_GZ]
 source_urls = ['ftp://selab.janelia.org/pub/software/%s' % name.lower()]
 
 sanity_check_paths = {
-                      'files': ['bin/cm%s' % x for x in ['align', 'build', 'calibrate', 'convert', 'emit',
-                                                         'fetch', 'press', 'scan', 'search', 'stat']],
-                      'dirs': []
-                     }
+    'files': ['bin/cm%s' % x for x in ['align', 'build', 'calibrate', 'convert', 'emit',
+                                       'fetch', 'press', 'scan', 'search', 'stat']],
+    'dirs': []
+}
 
 moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/i/Infernal/Infernal-1.1rc1-goolf-1.4.10.eb b/easybuild/easyconfigs/i/Infernal/Infernal-1.1rc1-goolf-1.4.10.eb
index 051737c067f876345f8d748afa269a0b836ce56e..9c4049ce58e9998e3929e18da57dd8adfc8fb4f1 100644
--- a/easybuild/easyconfigs/i/Infernal/Infernal-1.1rc1-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/i/Infernal/Infernal-1.1rc1-goolf-1.4.10.eb
@@ -26,9 +26,9 @@ sources = [SOURCELOWER_TAR_GZ]
 source_urls = ['ftp://selab.janelia.org/pub/software/%s' % name.lower()]
 
 sanity_check_paths = {
-                      'files': ['bin/cm%s' % x for x in ['align', 'build', 'calibrate', 'convert', 'emit',
-                                                         'fetch', 'press', 'scan', 'search', 'stat']],
-                      'dirs': []
-                     }
+    'files': ['bin/cm%s' % x for x in ['align', 'build', 'calibrate', 'convert', 'emit',
+                                       'fetch', 'press', 'scan', 'search', 'stat']],
+    'dirs': []
+}
 
 moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/i/Infernal/Infernal-1.1rc1-ictce-4.0.6.eb b/easybuild/easyconfigs/i/Infernal/Infernal-1.1rc1-ictce-4.0.6.eb
index 6c6330c16bc26fbc8d3752b75f212ddb119f06f9..3fb03037b9e60388f189914d9a25de3ec6c6c21d 100644
--- a/easybuild/easyconfigs/i/Infernal/Infernal-1.1rc1-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/i/Infernal/Infernal-1.1rc1-ictce-4.0.6.eb
@@ -26,9 +26,9 @@ sources = [SOURCELOWER_TAR_GZ]
 source_urls = ['ftp://selab.janelia.org/pub/software/%s' % name.lower()]
 
 sanity_check_paths = {
-                      'files': ['bin/cm%s' % x for x in ['align', 'build', 'calibrate', 'convert', 'emit',
-                                                         'fetch', 'press', 'scan', 'search', 'stat']],
-                      'dirs': []
-                     }
+    'files': ['bin/cm%s' % x for x in ['align', 'build', 'calibrate', 'convert', 'emit',
+                                       'fetch', 'press', 'scan', 'search', 'stat']],
+    'dirs': []
+}
 
 moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/i/Infernal/Infernal-1.1rc1-ictce-5.3.0.eb b/easybuild/easyconfigs/i/Infernal/Infernal-1.1rc1-ictce-5.3.0.eb
index d47730c4ff6f64a8614939def0b35c0fc7b6b670..ee33a329e8a21c174f556b90b892f29c9a35f60f 100644
--- a/easybuild/easyconfigs/i/Infernal/Infernal-1.1rc1-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/i/Infernal/Infernal-1.1rc1-ictce-5.3.0.eb
@@ -26,9 +26,9 @@ sources = [SOURCELOWER_TAR_GZ]
 source_urls = ['ftp://selab.janelia.org/pub/software/%s' % name.lower()]
 
 sanity_check_paths = {
-                      'files': ['bin/cm%s' % x for x in ['align', 'build', 'calibrate', 'convert', 'emit',
-                                                         'fetch', 'press', 'scan', 'search', 'stat']],
-                      'dirs': []
-                     }
+    'files': ['bin/cm%s' % x for x in ['align', 'build', 'calibrate', 'convert', 'emit',
+                                       'fetch', 'press', 'scan', 'search', 'stat']],
+    'dirs': []
+}
 
 moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/i/Inspector/Inspector-2013_update6.eb b/easybuild/easyconfigs/i/Inspector/Inspector-2013_update6.eb
index 21b9d17975bb49c26f2174232ca5c8d1e390adce..6959edee5c90246e162d2b19969f05f84f7e7752 100644
--- a/easybuild/easyconfigs/i/Inspector/Inspector-2013_update6.eb
+++ b/easybuild/easyconfigs/i/Inspector/Inspector-2013_update6.eb
@@ -4,7 +4,7 @@ version = '2013_update6'
 homepage = 'http://software.intel.com/en-us/intel-inspector-xe'
 description = "Intel Inspector XE 2013 is an easy to use memory error checker and thread checker for serial and parallel applications"
 
-toolchain = {'name':'dummy','version':'dummy'}
+toolchain = {'name': 'dummy', 'version': 'dummy'}
 
 sources = ['inspector_xe_%s.tar.gz' % version]
 
diff --git a/easybuild/easyconfigs/i/Instant/Instant-1.0.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb b/easybuild/easyconfigs/i/Instant/Instant-1.0.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb
index 277a6eef32f513f2be4e5b1a007a60e01a326aea..538671288fccd2774215f3b9370b79f716776f50 100644
--- a/easybuild/easyconfigs/i/Instant/Instant-1.0.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/i/Instant/Instant-1.0.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb
@@ -20,13 +20,13 @@ pythonshortversion = ".".join(pythonversion.split(".")[:-1])
 versionsuffix = '-%s-%s' % (python, pythonversion)
 
 dependencies = [
-                (python, pythonversion),
-                ('SWIG', '2.0.4', versionsuffix),
-               ]
+    (python, pythonversion),
+    ('SWIG', '2.0.4', versionsuffix),
+]
 
 sanity_check_paths = {
-                      'files': [],
-                      'dirs': ['bin', 'lib/python%s/site-packages/instant' % pythonshortversion]
-                     }
+    'files': [],
+    'dirs': ['bin', 'lib/python%s/site-packages/instant' % pythonshortversion]
+}
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/i/Instant/Instant-1.0.0-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/i/Instant/Instant-1.0.0-goolf-1.4.10-Python-2.7.3.eb
index 03e594c798ae49f2bfecd067559042d34c918cff..6966353326c301fb1382196161665d667cf7b8a4 100644
--- a/easybuild/easyconfigs/i/Instant/Instant-1.0.0-goolf-1.4.10-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/i/Instant/Instant-1.0.0-goolf-1.4.10-Python-2.7.3.eb
@@ -19,13 +19,13 @@ pythonshortversion = ".".join(pythonversion.split(".")[:-1])
 versionsuffix = '-%s-%s' % (python, pythonversion)
 
 dependencies = [
-                (python, pythonversion),
-                ('SWIG', '2.0.4', versionsuffix),
-               ]
+    (python, pythonversion),
+    ('SWIG', '2.0.4', versionsuffix),
+]
 
 sanity_check_paths = {
-                      'files': [],
-                      'dirs': ['bin', 'lib/python%s/site-packages/instant' % pythonshortversion]
-                     }
+    'files': [],
+    'dirs': ['bin', 'lib/python%s/site-packages/instant' % pythonshortversion]
+}
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/i/Instant/Instant-1.0.0-ictce-4.0.6-Python-2.7.3.eb b/easybuild/easyconfigs/i/Instant/Instant-1.0.0-ictce-4.0.6-Python-2.7.3.eb
index 564d83ba0f2533a916e13f7b7f9a1b4904d0e29a..9177b94846d4cc5b29c501415e4d281cfbab1239 100644
--- a/easybuild/easyconfigs/i/Instant/Instant-1.0.0-ictce-4.0.6-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/i/Instant/Instant-1.0.0-ictce-4.0.6-Python-2.7.3.eb
@@ -20,13 +20,13 @@ pythonshortversion = ".".join(pythonversion.split(".")[:-1])
 versionsuffix = '-%s-%s' % (python, pythonversion)
 
 dependencies = [
-                (python, pythonversion),
-                ('SWIG', '2.0.4', versionsuffix),
-               ]
+    (python, pythonversion),
+    ('SWIG', '2.0.4', versionsuffix),
+]
 
 sanity_check_paths = {
-                      'files': [],
-                      'dirs': ['bin', 'lib/python%s/site-packages/instant' % pythonshortversion]
-                     }
+    'files': [],
+    'dirs': ['bin', 'lib/python%s/site-packages/instant' % pythonshortversion]
+}
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/i/Instant/Instant-1.0.0-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/i/Instant/Instant-1.0.0-ictce-5.3.0-Python-2.7.3.eb
index bc7d16b9ba7a19318f30fc0b39979a8e38080993..4e88df40472d2e7b4eb64f1edc2f0f0848b3c8a3 100644
--- a/easybuild/easyconfigs/i/Instant/Instant-1.0.0-ictce-5.3.0-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/i/Instant/Instant-1.0.0-ictce-5.3.0-Python-2.7.3.eb
@@ -21,13 +21,13 @@ pythonshortversion = ".".join(pythonversion.split(".")[:-1])
 versionsuffix = '-%s-%s' % (python, pythonversion)
 
 dependencies = [
-                (python, pythonversion),
-                ('SWIG', '2.0.4', versionsuffix),
-               ]
+    (python, pythonversion),
+    ('SWIG', '2.0.4', versionsuffix),
+]
 
 sanity_check_paths = {
-                      'files': [],
-                      'dirs': ['bin', 'lib/python%s/site-packages/instant' % pythonshortversion]
-                     }
+    'files': [],
+    'dirs': ['bin', 'lib/python%s/site-packages/instant' % pythonshortversion]
+}
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/i/Iperf/Iperf-2.0.5-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/i/Iperf/Iperf-2.0.5-goalf-1.1.0-no-OFED.eb
index 2bd2eaa62000aa71e4d71fd365fb24780a3c3172..974a5d000e3e345cdd6519e45c80a39f54d5a898 100644
--- a/easybuild/easyconfigs/i/Iperf/Iperf-2.0.5-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/i/Iperf/Iperf-2.0.5-goalf-1.1.0-no-OFED.eb
@@ -24,8 +24,8 @@ source_urls = [('http://sourceforge.net/projects/iperf/files', 'download')]
 toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
 
 sanity_check_paths = {
-                      'files': ['bin/iperf'],
-                      'dirs': []
-                     }
+    'files': ['bin/iperf'],
+    'dirs': []
+}
 
 moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/i/Iperf/Iperf-2.0.5-goolf-1.4.10.eb b/easybuild/easyconfigs/i/Iperf/Iperf-2.0.5-goolf-1.4.10.eb
index c1d7b2439f9586ed6c8257b0d0cddf92a2adfd74..68b608ac4bd2e8724d8e03501997b0fbebc56811 100644
--- a/easybuild/easyconfigs/i/Iperf/Iperf-2.0.5-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/i/Iperf/Iperf-2.0.5-goolf-1.4.10.eb
@@ -23,8 +23,8 @@ source_urls = [('http://sourceforge.net/projects/iperf/files', 'download')]
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 
 sanity_check_paths = {
-                      'files': ['bin/iperf'],
-                      'dirs': []
-                     }
+    'files': ['bin/iperf'],
+    'dirs': []
+}
 
 moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/i/Iperf/Iperf-2.0.5-ictce-4.0.6.eb b/easybuild/easyconfigs/i/Iperf/Iperf-2.0.5-ictce-4.0.6.eb
index 27fbe32e7f7c55f88c0bff11ae35e78845f1d041..c6a180825f846625321f0cb27ca3c5b4161347d5 100644
--- a/easybuild/easyconfigs/i/Iperf/Iperf-2.0.5-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/i/Iperf/Iperf-2.0.5-ictce-4.0.6.eb
@@ -24,8 +24,8 @@ source_urls = [('http://sourceforge.net/projects/iperf/files', 'download')]
 toolchain = {'version': '4.0.6', 'name': 'ictce'}
 
 sanity_check_paths = {
-                      'files': ['bin/iperf'],
-                      'dirs': []
-                     }
+    'files': ['bin/iperf'],
+    'dirs': []
+}
 
 moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/i/Iperf/Iperf-2.0.5-ictce-5.3.0.eb b/easybuild/easyconfigs/i/Iperf/Iperf-2.0.5-ictce-5.3.0.eb
index a244a5f6bbeaabcee0778766366a4af0cd766c7a..3bbd50af7cec28fa0df6e687ceb9b31f76a64db0 100644
--- a/easybuild/easyconfigs/i/Iperf/Iperf-2.0.5-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/i/Iperf/Iperf-2.0.5-ictce-5.3.0.eb
@@ -25,8 +25,8 @@ source_urls = [('http://sourceforge.net/projects/iperf/files', 'download')]
 toolchain = {'name': 'ictce', 'version': '5.3.0'}
 
 sanity_check_paths = {
-                      'files': ['bin/iperf'],
-                      'dirs': []
-                     }
+    'files': ['bin/iperf'],
+    'dirs': []
+}
 
 moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/i/icc/icc-2013_sp1.4.211.eb b/easybuild/easyconfigs/i/icc/icc-2013_sp1.4.211.eb
index f375c6b518c03a1a48d1bb1c5f4ff85007b2df55..5850a5593b8fa689aa19f82bb6218802df3e914d 100644
--- a/easybuild/easyconfigs/i/icc/icc-2013_sp1.4.211.eb
+++ b/easybuild/easyconfigs/i/icc/icc-2013_sp1.4.211.eb
@@ -17,4 +17,3 @@ dontcreateinstalldir = 'True'
 # license file
 import os
 license_file = os.path.join(os.getenv('HOME'), "licenses", "intel", "license.lic")
-
diff --git a/easybuild/easyconfigs/i/icc/icc-2015.2.164-GCC-4.9.2.eb b/easybuild/easyconfigs/i/icc/icc-2015.2.164-GCC-4.9.2.eb
index edbddbc36da3ea72a3c2074c557f206da85f78e8..6ae91f49df63f353e37bb71fcd6de370f3d85fab 100644
--- a/easybuild/easyconfigs/i/icc/icc-2015.2.164-GCC-4.9.2.eb
+++ b/easybuild/easyconfigs/i/icc/icc-2015.2.164-GCC-4.9.2.eb
@@ -21,4 +21,3 @@ import os
 license_file = os.path.join(os.getenv('HOME'), "licenses", "intel", "license.lic")
 
 moduleclass = 'compiler'
-
diff --git a/easybuild/easyconfigs/i/icc/icc-2015.3.187-GNU-4.9.3-2.25.eb b/easybuild/easyconfigs/i/icc/icc-2015.3.187-GNU-4.9.3-2.25.eb
index aca2626f977b0f84d2108eff3c8aaaaf53b859ee..5d89d21731d4988c4212a5e5ee3837df13021199 100644
--- a/easybuild/easyconfigs/i/icc/icc-2015.3.187-GNU-4.9.3-2.25.eb
+++ b/easybuild/easyconfigs/i/icc/icc-2015.3.187-GNU-4.9.3-2.25.eb
@@ -21,4 +21,3 @@ import os
 license_file = os.path.join(os.getenv('HOME'), "licenses", "intel", "license.lic")
 
 moduleclass = 'compiler'
-
diff --git a/easybuild/easyconfigs/i/iccifort/iccifort-2013_sp1.4.211.eb b/easybuild/easyconfigs/i/iccifort/iccifort-2013_sp1.4.211.eb
index 767174222ae249727ee00f448200c54f3bb3a5ad..8132cf523d42e81c9337b31aa0df90e9657b9abb 100644
--- a/easybuild/easyconfigs/i/iccifort/iccifort-2013_sp1.4.211.eb
+++ b/easybuild/easyconfigs/i/iccifort/iccifort-2013_sp1.4.211.eb
@@ -15,4 +15,3 @@ dependencies = [
 ]
 
 moduleclass = 'toolchain'
-
diff --git a/easybuild/easyconfigs/i/ifort/ifort-2013_sp1.4.211.eb b/easybuild/easyconfigs/i/ifort/ifort-2013_sp1.4.211.eb
index e3dcbcdd250a63992f2df915f8f6ba40c46ec63b..4e061aba7c0fdce3297312b90923f47b6d7234a5 100644
--- a/easybuild/easyconfigs/i/ifort/ifort-2013_sp1.4.211.eb
+++ b/easybuild/easyconfigs/i/ifort/ifort-2013_sp1.4.211.eb
@@ -17,4 +17,3 @@ dontcreateinstalldir = 'True'
 # license file
 import os
 license_file = os.path.join(os.getenv('HOME'), "licenses", "intel", "license.lic")
-
diff --git a/easybuild/easyconfigs/i/iimpi/iimpi-2016.00-GCC-4.9.3-2.25.eb b/easybuild/easyconfigs/i/iimpi/iimpi-2016.00-GCC-4.9.3-2.25.eb
index b4eb7cc8a8ed06d954fcb37b88836d76a9fda902..73e504fad6c83d8d3425e40d8a6c2274c1ffc7bd 100644
--- a/easybuild/easyconfigs/i/iimpi/iimpi-2016.00-GCC-4.9.3-2.25.eb
+++ b/easybuild/easyconfigs/i/iimpi/iimpi-2016.00-GCC-4.9.3-2.25.eb
@@ -18,4 +18,3 @@ dependencies = [
 ]
 
 moduleclass = 'toolchain'
-
diff --git a/easybuild/easyconfigs/i/iimpi/iimpi-2016.01-GCC-4.9.3-2.25.eb b/easybuild/easyconfigs/i/iimpi/iimpi-2016.01-GCC-4.9.3-2.25.eb
index 7d57b6f4a503caeff8ff5d34a3a2c0eb98fc1e41..5df1cad542eb747b126a74da8d82ff446871c7fe 100644
--- a/easybuild/easyconfigs/i/iimpi/iimpi-2016.01-GCC-4.9.3-2.25.eb
+++ b/easybuild/easyconfigs/i/iimpi/iimpi-2016.01-GCC-4.9.3-2.25.eb
@@ -20,4 +20,3 @@ dependencies = [
 ]
 
 moduleclass = 'toolchain'
-
diff --git a/easybuild/easyconfigs/i/iiqmpi/iiqmpi-3.3.0.eb b/easybuild/easyconfigs/i/iiqmpi/iiqmpi-3.3.0.eb
index 3044633d52d2542dfdc16fd1ecf2ebe9553e897d..fc4f68936d46cfdf857774aaaa859d3bfdbec427 100644
--- a/easybuild/easyconfigs/i/iiqmpi/iiqmpi-3.3.0.eb
+++ b/easybuild/easyconfigs/i/iiqmpi/iiqmpi-3.3.0.eb
@@ -17,9 +17,9 @@ dependencies = [
 ]
 
 modextravars = {
-    'MPICH_CC':'icc',
-    'MPICH_F77':'ifort',
-    'MPICH_F90':'ifort',
+    'MPICH_CC': 'icc',
+    'MPICH_F77': 'ifort',
+    'MPICH_F90': 'ifort',
 }
 
 moduleclass = 'toolchain'
diff --git a/easybuild/easyconfigs/i/iiqmpi/iiqmpi-4.4.13.eb b/easybuild/easyconfigs/i/iiqmpi/iiqmpi-4.4.13.eb
index 1091bb646e31d91f130d8c2b6e724c825c20084e..df8e9f4731bd1e508cbeba20db1b3488303ebf4a 100644
--- a/easybuild/easyconfigs/i/iiqmpi/iiqmpi-4.4.13.eb
+++ b/easybuild/easyconfigs/i/iiqmpi/iiqmpi-4.4.13.eb
@@ -17,9 +17,9 @@ dependencies = [
 ]
 
 modextravars = {
-    'MPICH_CC':'icc',
-    'MPICH_F77':'ifort',
-    'MPICH_F90':'ifort',
+    'MPICH_CC': 'icc',
+    'MPICH_F77': 'ifort',
+    'MPICH_F90': 'ifort',
 }
 
 moduleclass = 'toolchain'
diff --git a/easybuild/easyconfigs/i/imkl/imkl-11.1.4.211-iompi-6.6.4.eb b/easybuild/easyconfigs/i/imkl/imkl-11.1.4.211-iompi-6.6.4.eb
index c7ad8e1fbd6686dae36f62536b027b1f3f934ae7..11818df67591a35b760f64cc95a62a450baf4d7d 100644
--- a/easybuild/easyconfigs/i/imkl/imkl-11.1.4.211-iompi-6.6.4.eb
+++ b/easybuild/easyconfigs/i/imkl/imkl-11.1.4.211-iompi-6.6.4.eb
@@ -20,4 +20,3 @@ import os
 license_file = os.path.join(os.getenv('HOME'), "licenses", "intel", "license.lic")
 
 moduleclass = 'numlib'
-
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 58af7333725d64dd785894bbdb90c93f5ec86b0f..83e7ad590dedc36f63a0e8969c9a80d014fceddf 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
@@ -19,4 +19,3 @@ license_file = os.path.join(os.getenv('HOME'), "licenses", "intel", "license.lic
 interfaces = True
 
 moduleclass = 'numlib'
-
diff --git a/easybuild/easyconfigs/i/imkl/imkl-11.3.0.109-iimpi-2016.00-GCC-4.9.3-2.25.eb b/easybuild/easyconfigs/i/imkl/imkl-11.3.0.109-iimpi-2016.00-GCC-4.9.3-2.25.eb
index 3b5d9dbf2b2cd5e14e28c48ac529e24c3ef72a59..f295b509252320d7bfd2ebd0a0337b848e6bbbfc 100644
--- a/easybuild/easyconfigs/i/imkl/imkl-11.3.0.109-iimpi-2016.00-GCC-4.9.3-2.25.eb
+++ b/easybuild/easyconfigs/i/imkl/imkl-11.3.0.109-iimpi-2016.00-GCC-4.9.3-2.25.eb
@@ -16,7 +16,7 @@ checksums = ['47567e38801efe273b36b5250c759af7']
 
 dontcreateinstalldir = 'True'
 
-#license file
+# license file
 import os
 license_file = os.path.join(os.getenv('HOME'), "licenses", "intel", "license.lic")
 
diff --git a/easybuild/easyconfigs/i/imkl/imkl-11.3.1.150-iimpi-2016.01-GCC-4.9.3-2.25.eb b/easybuild/easyconfigs/i/imkl/imkl-11.3.1.150-iimpi-2016.01-GCC-4.9.3-2.25.eb
index ea1d887cb59610d5f06376e6a357c9da0ba7005a..e40fb8448adef7a614579bc5a10a9b19c02fb5fa 100644
--- a/easybuild/easyconfigs/i/imkl/imkl-11.3.1.150-iimpi-2016.01-GCC-4.9.3-2.25.eb
+++ b/easybuild/easyconfigs/i/imkl/imkl-11.3.1.150-iimpi-2016.01-GCC-4.9.3-2.25.eb
@@ -16,7 +16,7 @@ checksums = ['b57ff502b5f97f2f783e4bbda7ce42b3']
 
 dontcreateinstalldir = 'True'
 
-#license file
+# license file
 import os
 license_file = os.path.join(os.getenv('HOME'), "licenses", "intel", "license.lic")
 
@@ -34,5 +34,5 @@ postinstallcmds = [
 ]
 
 modextravars = {
-     'MKL_EXAMPLES' : '%(installdir)s/mkl/examples/',
+    'MKL_EXAMPLES': '%(installdir)s/mkl/examples/',
 }
diff --git a/easybuild/easyconfigs/i/intel-para/intel-para-2014.12.eb b/easybuild/easyconfigs/i/intel-para/intel-para-2014.12.eb
index 071bb1cdbbc69ada362a71de4e46bca58b3056e8..d41e8ec2507cd7f500488d0f9bc8d5db9c4a86ba 100644
--- a/easybuild/easyconfigs/i/intel-para/intel-para-2014.12.eb
+++ b/easybuild/easyconfigs/i/intel-para/intel-para-2014.12.eb
@@ -25,4 +25,3 @@ dependencies = [
 
 
 moduleclass = 'toolchain'
-
diff --git a/easybuild/easyconfigs/i/intel/intel-2016.00.eb b/easybuild/easyconfigs/i/intel/intel-2016.00.eb
index 0b62fdc0f41ff35029660f42a82e772c56ca07e8..241463337ade35a799291414d6639fae0179ae29 100644
--- a/easybuild/easyconfigs/i/intel/intel-2016.00.eb
+++ b/easybuild/easyconfigs/i/intel/intel-2016.00.eb
@@ -19,7 +19,7 @@ dependencies = [
     ('icc', compver, gccsuff),
     ('ifort', compver, gccsuff),
     ('impi', '5.1.1.109', '', ('iccifort', '%s%s' % (compver, gccsuff))),
-    ('imkl', '11.3.0.109', '', ('iimpi', '%s%s' % (version,gccsuff))),
+    ('imkl', '11.3.0.109', '', ('iimpi', '%s%s' % (version, gccsuff))),
 ]
 
 moduleclass = 'toolchain'
diff --git a/easybuild/easyconfigs/i/intel/intel-2016.01.eb b/easybuild/easyconfigs/i/intel/intel-2016.01.eb
index 766d5b1fdaf706af4a33e19bca11f076567966e5..37f96fa0142f3ec8c62dccdc39faa7e88ad2c41c 100644
--- a/easybuild/easyconfigs/i/intel/intel-2016.01.eb
+++ b/easybuild/easyconfigs/i/intel/intel-2016.01.eb
@@ -19,7 +19,7 @@ dependencies = [
     ('icc', compver, gccsuff),
     ('ifort', compver, gccsuff),
     ('impi', '5.1.2.150', '', ('iccifort', '%s%s' % (compver, gccsuff))),
-    ('imkl', '11.3.1.150', '', ('iimpi', '%s%s' % (version,gccsuff))),
+    ('imkl', '11.3.1.150', '', ('iimpi', '%s%s' % (version, gccsuff))),
 ]
 
 moduleclass = 'toolchain'
diff --git a/easybuild/easyconfigs/i/intltool/intltool-0.51.0-intel-2015b.eb b/easybuild/easyconfigs/i/intltool/intltool-0.51.0-intel-2015b.eb
index 42ab6e143c6d366304bf4781e43d4a79cb77fba3..722616eb78e66e70a7b2847a2e89d91903d19518 100644
--- a/easybuild/easyconfigs/i/intltool/intltool-0.51.0-intel-2015b.eb
+++ b/easybuild/easyconfigs/i/intltool/intltool-0.51.0-intel-2015b.eb
@@ -9,7 +9,7 @@ description = """intltool is a set of tools to centralize translation of
 
 toolchain = {'name': 'intel', 'version': '2015b'}
 
-source_urls  = ['http://launchpad.net/intltool/trunk/%(version)s/+download/']
+source_urls = ['http://launchpad.net/intltool/trunk/%(version)s/+download/']
 sources = [SOURCE_TAR_GZ]
 
 dependencies = [
diff --git a/easybuild/easyconfigs/i/iompi/iompi-2015.01.eb b/easybuild/easyconfigs/i/iompi/iompi-2015.01.eb
index 6392c4027f4719c8f2a5a4b2d5ee861dbd16e3da..5bd039e031d1d9b81bd68d8302836b7057393d64 100644
--- a/easybuild/easyconfigs/i/iompi/iompi-2015.01.eb
+++ b/easybuild/easyconfigs/i/iompi/iompi-2015.01.eb
@@ -17,4 +17,3 @@ dependencies = [
 ]
 
 moduleclass = 'toolchain'
-
diff --git a/easybuild/easyconfigs/i/iompi/iompi-2015.02.eb b/easybuild/easyconfigs/i/iompi/iompi-2015.02.eb
index 698ba1f804b44960f8d2b7bf77fc35ae4a60f9a6..726413e1620d9f00a0ec6d0deefcfc7db9a32de6 100644
--- a/easybuild/easyconfigs/i/iompi/iompi-2015.02.eb
+++ b/easybuild/easyconfigs/i/iompi/iompi-2015.02.eb
@@ -17,4 +17,3 @@ dependencies = [
 ]
 
 moduleclass = 'toolchain'
-
diff --git a/easybuild/easyconfigs/i/iompi/iompi-2015.03.eb b/easybuild/easyconfigs/i/iompi/iompi-2015.03.eb
index 539222425a997343fcd105f2de49c9e2d9c95676..83b42beffd48b78817872743ad564905d448149e 100644
--- a/easybuild/easyconfigs/i/iompi/iompi-2015.03.eb
+++ b/easybuild/easyconfigs/i/iompi/iompi-2015.03.eb
@@ -17,4 +17,3 @@ dependencies = [
 ]
 
 moduleclass = 'toolchain'
-
diff --git a/easybuild/easyconfigs/i/iompi/iompi-6.6.4-no-OFED.eb b/easybuild/easyconfigs/i/iompi/iompi-6.6.4-no-OFED.eb
index 091224afc0d8a6d35538bf8112cf2351d6ccc296..50058717bb4d9d496adee575f9791e4514aa0732 100644
--- a/easybuild/easyconfigs/i/iompi/iompi-6.6.4-no-OFED.eb
+++ b/easybuild/easyconfigs/i/iompi/iompi-6.6.4-no-OFED.eb
@@ -20,4 +20,3 @@ dependencies = [
 ]
 
 moduleclass = 'toolchain'
-
diff --git a/easybuild/easyconfigs/i/iompi/iompi-6.6.4.eb b/easybuild/easyconfigs/i/iompi/iompi-6.6.4.eb
index 8dccca825e5820df9f580374a15a3520eb1e7f42..a2a368a96a6a6435f4faa43bd56a2cffe192368c 100644
--- a/easybuild/easyconfigs/i/iompi/iompi-6.6.4.eb
+++ b/easybuild/easyconfigs/i/iompi/iompi-6.6.4.eb
@@ -19,4 +19,3 @@ dependencies = [
 ]
 
 moduleclass = 'toolchain'
-
diff --git a/easybuild/easyconfigs/i/ipsmpi/ipsmpi-2014.12.eb b/easybuild/easyconfigs/i/ipsmpi/ipsmpi-2014.12.eb
index 4a33e11b3a0cab0b4513204c967976c4a2b80e8d..6aff711eb4f8b55b4c97590926638194022952af 100644
--- a/easybuild/easyconfigs/i/ipsmpi/ipsmpi-2014.12.eb
+++ b/easybuild/easyconfigs/i/ipsmpi/ipsmpi-2014.12.eb
@@ -24,4 +24,3 @@ dependencies = [
 ]
 
 moduleclass = 'toolchain'
-
diff --git a/easybuild/easyconfigs/i/iqacml/iqacml-3.7.3.eb b/easybuild/easyconfigs/i/iqacml/iqacml-3.7.3.eb
index 09d75e1ad88d2d537f873d65cafb8c63109e8ed4..14df692f5cae49e079933f430e67c32fb8905a4d 100644
--- a/easybuild/easyconfigs/i/iqacml/iqacml-3.7.3.eb
+++ b/easybuild/easyconfigs/i/iqacml/iqacml-3.7.3.eb
@@ -34,9 +34,9 @@ dependencies = [
 ]
 
 modextravars = {
-    'MPICH_CC':'icc',
-    'MPICH_F77':'ifort',
-    'MPICH_F90':'ifort',
+    'MPICH_CC': 'icc',
+    'MPICH_F77': 'ifort',
+    'MPICH_F90': 'ifort',
 }
 
 moduleclass = 'toolchain'
diff --git a/easybuild/easyconfigs/i/iqacml/iqacml-4.4.13.eb b/easybuild/easyconfigs/i/iqacml/iqacml-4.4.13.eb
index 3027178ee50bd728636a2e047c111cc1c71583c1..1c12d8bcc8d2c9931d723308453e0ff45d6e2e4f 100644
--- a/easybuild/easyconfigs/i/iqacml/iqacml-4.4.13.eb
+++ b/easybuild/easyconfigs/i/iqacml/iqacml-4.4.13.eb
@@ -6,7 +6,7 @@ version = '4.4.13'
 homepage = 'http://software.intel.com/en-us/intel-cluster-toolkit-compiler/'
 description = """Intel Cluster Toolkit Compiler Edition provides Intel C,C++ and fortran compilers, QLogic MPI and AMD Core Math Library (ACML)."""
 
-toolchain = {'name':'dummy','version':'dummy'}
+toolchain = {'name': 'dummy', 'version': 'dummy'}
 
 compv = '2011.13.367'
 
@@ -19,7 +19,7 @@ tcname = 'iiqmpi'
 tcver = '4.4.13'
 tc = (tcname, tcver)
 
-## deps for interface build
+# deps for interface build
 dependencies = [
     ('icc', compv),
     ('ifort', compv),
@@ -31,8 +31,8 @@ dependencies = [
 
 modextravars = {
     'MPICH_CC': 'icc',
-    'MPICH_F77':'ifort',
-    'MPICH_F90':'ifort'
+    'MPICH_F77': 'ifort',
+    'MPICH_F90': 'ifort'
 }
 
 moduleclass = 'toolchain'
diff --git a/easybuild/easyconfigs/j/JAGS/JAGS-3.4.0-goolf-1.4.10.eb b/easybuild/easyconfigs/j/JAGS/JAGS-3.4.0-goolf-1.4.10.eb
index c85a8270b1f7f711be6c2a390e744b8bd1454ef3..d0c11088720ecb2ffd4e9ae566d9cc388e72a6a1 100644
--- a/easybuild/easyconfigs/j/JAGS/JAGS-3.4.0-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/j/JAGS/JAGS-3.4.0-goolf-1.4.10.eb
@@ -30,4 +30,3 @@ modextrapaths = {
 }
 
 moduleclass = 'math'
-
diff --git a/easybuild/easyconfigs/j/JAGS/JAGS-3.4.0-ictce-6.2.5.eb b/easybuild/easyconfigs/j/JAGS/JAGS-3.4.0-ictce-6.2.5.eb
index 4b9b0d8456a3109dac09dc0749673d4b6d3301b6..9e1ed006d540b8c1df786dfc450dacaa29647008 100644
--- a/easybuild/easyconfigs/j/JAGS/JAGS-3.4.0-ictce-6.2.5.eb
+++ b/easybuild/easyconfigs/j/JAGS/JAGS-3.4.0-ictce-6.2.5.eb
@@ -30,4 +30,3 @@ modextrapaths = {
 }
 
 moduleclass = 'math'
-
diff --git a/easybuild/easyconfigs/j/JAGS/JAGS-3.4.0-intel-2014b.eb b/easybuild/easyconfigs/j/JAGS/JAGS-3.4.0-intel-2014b.eb
index e57e27043b8f52e539d36f3a0bf8ef0052411f84..76755f474c05c93b67b16766b62b0a7bc0df9870 100644
--- a/easybuild/easyconfigs/j/JAGS/JAGS-3.4.0-intel-2014b.eb
+++ b/easybuild/easyconfigs/j/JAGS/JAGS-3.4.0-intel-2014b.eb
@@ -30,4 +30,3 @@ modextrapaths = {
 }
 
 moduleclass = 'math'
-
diff --git a/easybuild/easyconfigs/j/JUBE/JUBE-2.0.3.eb b/easybuild/easyconfigs/j/JUBE/JUBE-2.0.3.eb
index 903be570eba76b8d092434cb05f7d7991af2b900..9ff6f83aaf37d802da09b8d38e21dbb3abf005b0 100644
--- a/easybuild/easyconfigs/j/JUBE/JUBE-2.0.3.eb
+++ b/easybuild/easyconfigs/j/JUBE/JUBE-2.0.3.eb
@@ -16,8 +16,8 @@ checksums = ['8afc5e3959752e7541f5f59b07fd1e1c']
 options = {'modulename': 'jube2'}
 
 sanity_check_paths = {
-  'files': ['bin/jube'],
-  'dirs': []
+    'files': ['bin/jube'],
+    'dirs': []
 }
 
 moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/j/JUBE/JUBE-2.0.4.eb b/easybuild/easyconfigs/j/JUBE/JUBE-2.0.4.eb
index 545b5785eada40b34061adf8097d4741040ecd91..6a73bae83a701fe5eba9f5b519bb6a56e24077cc 100644
--- a/easybuild/easyconfigs/j/JUBE/JUBE-2.0.4.eb
+++ b/easybuild/easyconfigs/j/JUBE/JUBE-2.0.4.eb
@@ -16,8 +16,8 @@ checksums = ['96a7946d38d678b25ba4bbd539482a14']
 options = {'modulename': 'jube2'}
 
 sanity_check_paths = {
-  'files': ['bin/jube'],
-  'dirs': []
+    'files': ['bin/jube'],
+    'dirs': []
 }
 
 moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/j/JUBE/JUBE-2.0.5.eb b/easybuild/easyconfigs/j/JUBE/JUBE-2.0.5.eb
index b270f53d57e3e3d997743f6207a0f4a5e01843dd..0d36653ae0e25dc85f5e088ebee83c353e64a267 100644
--- a/easybuild/easyconfigs/j/JUBE/JUBE-2.0.5.eb
+++ b/easybuild/easyconfigs/j/JUBE/JUBE-2.0.5.eb
@@ -16,8 +16,8 @@ checksums = ['f506e9f39898af3d7456890ba219ab90']
 options = {'modulename': 'jube2'}
 
 sanity_check_paths = {
-  'files': ['bin/jube'],
-  'dirs': []
+    'files': ['bin/jube'],
+    'dirs': []
 }
 
 moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/j/JUnit/JUnit-4.11-Java-1.7.0_75.eb b/easybuild/easyconfigs/j/JUnit/JUnit-4.11-Java-1.7.0_75.eb
new file mode 100644
index 0000000000000000000000000000000000000000..73ee3252a1a7b1581ca2fa1f4b0bd7bee4fc12c7
--- /dev/null
+++ b/easybuild/easyconfigs/j/JUnit/JUnit-4.11-Java-1.7.0_75.eb
@@ -0,0 +1,25 @@
+easyblock = 'JAR'
+
+name = 'JUnit'
+version = '4.11'
+
+homepage = 'http://sourceforge.net/projects/junit'
+description = """A programmer-oriented testing framework for Java."""
+
+toolchain = {'name': 'dummy', 'version': ''}
+
+sources = ['%(namelower)s-%(version)s.jar']
+source_urls = ['http://search.maven.org/remotecontent?filepath=junit/junit/%(version)s/']
+
+java = 'Java'
+javaver = '1.7.0_75'
+versionsuffix = '-%s-%s' % (java, javaver)
+
+dependencies = [(java, javaver)]
+
+sanity_check_paths = {
+    'files': sources,
+    'dirs': [],
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/j/JUnit/JUnit-4.12-Java-1.7.0_80.eb b/easybuild/easyconfigs/j/JUnit/JUnit-4.12-Java-1.7.0_80.eb
new file mode 100644
index 0000000000000000000000000000000000000000..c0074dc071dc8fe7f7dd5855ccfca431e6fb26c6
--- /dev/null
+++ b/easybuild/easyconfigs/j/JUnit/JUnit-4.12-Java-1.7.0_80.eb
@@ -0,0 +1,22 @@
+easyblock = 'JAR'
+
+name = 'JUnit'
+version = '4.12'
+versionsuffix = '-Java-%(javaver)s'
+
+homepage = 'http://sourceforge.net/projects/junit'
+description = """A programmer-oriented testing framework for Java."""
+
+toolchain = {'name': 'dummy', 'version': ''}
+
+sources = ['%(namelower)s-%(version)s.jar']
+source_urls = ['http://search.maven.org/remotecontent?filepath=junit/junit/%(version)s/']
+
+dependencies = [('Java', '1.7.0_80')]
+
+sanity_check_paths = {
+    'files': sources,
+    'dirs': [],
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/j/Java/Java-1.8.0_72.eb b/easybuild/easyconfigs/j/Java/Java-1.8.0_72.eb
new file mode 100644
index 0000000000000000000000000000000000000000..9d370ddcef09f879c99ab2f5f57c1107c5332edf
--- /dev/null
+++ b/easybuild/easyconfigs/j/Java/Java-1.8.0_72.eb
@@ -0,0 +1,15 @@
+name = 'Java'
+version = "1.8.0_72"
+
+homepage = 'http://java.com/'
+description = """Java Platform, Standard Edition (Java SE) lets you develop and deploy
+ Java applications on desktops and servers."""
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+# download the tar.gz directly from http://www.oracle.com/technetwork/java/javase/downloads/index.html
+(vp, vs) = version.split('_')
+altver = '%su%s' % (vp.split('.')[1], vs)
+sources = ['jdk-%s-linux-x64.tar.gz' % altver]
+
+moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/j/Java/Java-1.8.0_74.eb b/easybuild/easyconfigs/j/Java/Java-1.8.0_74.eb
new file mode 100644
index 0000000000000000000000000000000000000000..c9ef30b97eeb95921f0e5d799bfc96b67d61b97f
--- /dev/null
+++ b/easybuild/easyconfigs/j/Java/Java-1.8.0_74.eb
@@ -0,0 +1,15 @@
+name = 'Java'
+version = '1.8.0_74'
+
+homepage = 'http://java.com/'
+description = """Java Platform, Standard Edition (Java SE) lets you develop and deploy
+ Java applications on desktops and servers."""
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+# download the tar.gz directly from http://www.oracle.com/technetwork/java/javase/downloads/index.html
+(vp, vs) = version.split('_')
+altver = '%su%s' % (vp.split('.')[1], vs)
+sources = ['jdk-%s-linux-x64.tar.gz' % altver]
+
+moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/j/Jinja2/Jinja2-2.6-goalf-1.1.0-no-OFED-Python-2.7.3.eb b/easybuild/easyconfigs/j/Jinja2/Jinja2-2.6-goalf-1.1.0-no-OFED-Python-2.7.3.eb
index 46c4f977e8c60159001cb4a9dc1ecdf5084be5f3..5d9c1fff84ad74918c40f4680ba46f8bd52f86e0 100644
--- a/easybuild/easyconfigs/j/Jinja2/Jinja2-2.6-goalf-1.1.0-no-OFED-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/j/Jinja2/Jinja2-2.6-goalf-1.1.0-no-OFED-Python-2.7.3.eb
@@ -18,16 +18,16 @@ pythonversion = "2.7.3"
 versionsuffix = "-%s-%s" % (python, pythonversion)
 
 dependencies = [
-                (python, pythonversion),
-                ('setuptools', '0.6c11', versionsuffix)
-                ]
+    (python, pythonversion),
+    ('setuptools', '0.6c11', versionsuffix)
+]
 
 py_short_ver = ".".join(pythonversion.split(".")[0:2])
 pylibdir = "lib/python%s/site-packages/%s" % (py_short_ver, name)
 
 sanity_check_paths = {
-                      'files': [],
-                      'dirs': ["%s-%s-py%s.egg" % (pylibdir, version, py_short_ver)]
-                     }
+    'files': [],
+    'dirs': ["%s-%s-py%s.egg" % (pylibdir, version, py_short_ver)]
+}
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/j/Jinja2/Jinja2-2.6-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/j/Jinja2/Jinja2-2.6-goolf-1.4.10-Python-2.7.3.eb
index e37ffbc4e200b2442519fcfb932711f027575f65..2e7f9bf5822285fb1651c654559bc05365e1a4c8 100644
--- a/easybuild/easyconfigs/j/Jinja2/Jinja2-2.6-goolf-1.4.10-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/j/Jinja2/Jinja2-2.6-goolf-1.4.10-Python-2.7.3.eb
@@ -17,16 +17,16 @@ pythonversion = "2.7.3"
 versionsuffix = "-%s-%s" % (python, pythonversion)
 
 dependencies = [
-                (python, pythonversion),
-                ('setuptools', '0.6c11', versionsuffix)
-                ]
+    (python, pythonversion),
+    ('setuptools', '0.6c11', versionsuffix)
+]
 
 py_short_ver = ".".join(pythonversion.split(".")[0:2])
 pylibdir = "lib/python%s/site-packages/%s" % (py_short_ver, name)
 
 sanity_check_paths = {
-                      'files': [],
-                      'dirs': ["%s-%s-py%s.egg" % (pylibdir, version, py_short_ver)]
-                     }
+    'files': [],
+    'dirs': ["%s-%s-py%s.egg" % (pylibdir, version, py_short_ver)]
+}
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/j/Jinja2/Jinja2-2.6-ictce-4.0.6-Python-2.7.3.eb b/easybuild/easyconfigs/j/Jinja2/Jinja2-2.6-ictce-4.0.6-Python-2.7.3.eb
index 191856a900b64cc36bb0f071978369ac2e9650a3..6ac06a966d290969bd24c111b01c4e2a79f6b58b 100644
--- a/easybuild/easyconfigs/j/Jinja2/Jinja2-2.6-ictce-4.0.6-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/j/Jinja2/Jinja2-2.6-ictce-4.0.6-Python-2.7.3.eb
@@ -18,16 +18,16 @@ pythonversion = "2.7.3"
 versionsuffix = "-%s-%s" % (python, pythonversion)
 
 dependencies = [
-                (python, pythonversion),
-                ('setuptools', '0.6c11', versionsuffix)
-                ]
+    (python, pythonversion),
+    ('setuptools', '0.6c11', versionsuffix)
+]
 
 py_short_ver = ".".join(pythonversion.split(".")[0:2])
 pylibdir = "lib/python%s/site-packages/%s" % (py_short_ver, name)
 
 sanity_check_paths = {
-                      'files': [],
-                      'dirs': ["%s-%s-py%s.egg" % (pylibdir, version, py_short_ver)]
-                     }
+    'files': [],
+    'dirs': ["%s-%s-py%s.egg" % (pylibdir, version, py_short_ver)]
+}
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/j/Jinja2/Jinja2-2.6-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/j/Jinja2/Jinja2-2.6-ictce-5.3.0-Python-2.7.3.eb
index 9711dba080d22d65d1138b2658f583a361ec302e..64c7c6c2448f571b3306473aa6356b1aa40b48b7 100644
--- a/easybuild/easyconfigs/j/Jinja2/Jinja2-2.6-ictce-5.3.0-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/j/Jinja2/Jinja2-2.6-ictce-5.3.0-Python-2.7.3.eb
@@ -18,16 +18,16 @@ pythonversion = "2.7.3"
 versionsuffix = "-%s-%s" % (python, pythonversion)
 
 dependencies = [
-                (python, pythonversion),
-                ('setuptools', '0.6c11', versionsuffix)
-                ]
+    (python, pythonversion),
+    ('setuptools', '0.6c11', versionsuffix)
+]
 
 py_short_ver = ".".join(pythonversion.split(".")[0:2])
 pylibdir = "lib/python%s/site-packages/%s" % (py_short_ver, name)
 
 sanity_check_paths = {
-                      'files': [],
-                      'dirs': ["%s-%s-py%s.egg" % (pylibdir, version, py_short_ver)]
-                     }
+    'files': [],
+    'dirs': ["%s-%s-py%s.egg" % (pylibdir, version, py_short_ver)]
+}
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/j/jModelTest/jModelTest-2.1.9r20160115-goolf-1.4.10-Java-1.7.0_75.eb b/easybuild/easyconfigs/j/jModelTest/jModelTest-2.1.9r20160115-goolf-1.4.10-Java-1.7.0_75.eb
new file mode 100644
index 0000000000000000000000000000000000000000..91946b388ee31943ab198bea6c2eb14bad9ec950
--- /dev/null
+++ b/easybuild/easyconfigs/j/jModelTest/jModelTest-2.1.9r20160115-goolf-1.4.10-Java-1.7.0_75.eb
@@ -0,0 +1,36 @@
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+# Author: Pablo Escobar Lopez
+# sciCORE - University of Basel
+# SIB Swiss Institute of Bioinformatics 
+
+easyblock = 'PackedBinary'
+
+name = 'jModelTest'
+version = '2.1.9r20160115'
+
+homepage = 'https://github.com/ddarriba/jmodeltest2'
+description="""jModelTest is a tool to carry out statistical selection of best-fit models of nucleotide substitution."""
+
+toolchain = {'name': 'goolf', 'version': '1.4.10'}
+
+source_urls = ['https://github.com/ddarriba/jmodeltest2/archive/']
+sources = ['v%(version)s.tar.gz']
+
+java = 'Java'
+javaver = '1.7.0_75'
+versionsuffix = '-%s-%s' % (java, javaver)
+
+builddependencies = [('ant', '1.9.6', '-Java-1.7.0_75', True)]
+
+dependencies = [('MPJ-Express', '0.44', '%(versionsuffix)s')]
+
+install_cmd = "cd jmodeltest2-%(version)s && ant -Ddist.dir=%(installdir)s jar"
+
+modloadmsg = """To execute jModelTest run: java -jar \\$EBROOTJMODELTEST/jModelTest.jar"""
+
+sanity_check_paths = {
+    'files': ['jModelTest.jar'], 
+    'dirs': [],
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/k/KEALib/KEALib-1.4.4-foss-2015a.eb b/easybuild/easyconfigs/k/KEALib/KEALib-1.4.4-foss-2015a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..6d613af708e89963abceae014ce51e41162d3f07
--- /dev/null
+++ b/easybuild/easyconfigs/k/KEALib/KEALib-1.4.4-foss-2015a.eb
@@ -0,0 +1,36 @@
+easyblock = 'CMakeMake'
+
+name = 'KEALib'
+version = '1.4.4'
+
+homepage = 'http://www.kealib.org'
+description = """KEALib provides an implementation of the GDAL data model. The
+format supports raster attribute tables, image pyramids, meta-data and in-built
+statistics while also handling very large files and compression throughout.
+Based on the HDF5 standard, it also provides a base from which other formats
+can be derived and is a good choice for long term data archiving. An
+independent software library (libkea) provides complete access to the KEA image
+format and a GDAL driver allowing KEA images to be used from any GDAL supported
+software."""
+
+toolchain = {'name': 'foss', 'version': '2015a'}
+
+source_urls = ['https://bitbucket.org/chchrsc/kealib/downloads']
+sources = [SOURCELOWER_TAR_GZ]
+
+dependencies = [
+    ('HDF5', '1.8.16'),
+]
+
+builddependencies = [
+    ('CMake', '3.4.1'),
+]
+
+start_dir = 'trunk'
+
+sanity_check_paths = {
+    'files': ['lib/libkea.%s' % SHLIB_EXT, 'bin/kea-config'],
+    'dirs': ['bin', 'include', 'lib']
+}
+
+moduleclass = 'data'
diff --git a/easybuild/easyconfigs/k/Kerberos_V5/Kerberos_V5-1.12.2-intel-2014b.eb b/easybuild/easyconfigs/k/Kerberos_V5/Kerberos_V5-1.12.2-intel-2014b.eb
index d8151b8cd781b7eacf980a512b96de239ab42b12..7e7833875f8cb76e094284da377ba01aaac62b92 100644
--- a/easybuild/easyconfigs/k/Kerberos_V5/Kerberos_V5-1.12.2-intel-2014b.eb
+++ b/easybuild/easyconfigs/k/Kerberos_V5/Kerberos_V5-1.12.2-intel-2014b.eb
@@ -26,7 +26,7 @@ sanity_check_paths = {
               'sbin/kdb5_util', 'sbin/gss-server', 'sbin/kadmind',
               'lib/libkrb5.%s' % SHLIB_EXT, 'lib/libgssapi_krb5.%s' % SHLIB_EXT, 'lib/libkadm5clnt.%s' % SHLIB_EXT,
               'lib/libkadm5srv.%s' % SHLIB_EXT, 'lib/libkdb5.%s' % SHLIB_EXT, 'lib/libk5crypto.%s' % SHLIB_EXT,
-             ],
+              ],
     'dirs': ['lib/krb5']
 }
 
diff --git a/easybuild/easyconfigs/l/LLVM/LLVM-3.6.2-intel-2015a-Python-2.7.9.eb b/easybuild/easyconfigs/l/LLVM/LLVM-3.6.2-intel-2015a-Python-2.7.9.eb
index dcb8e49ef1969ec0972bf3f651ffaab42278332f..3c0e36d72c62918dcd143c2d254575caa472a382 100644
--- a/easybuild/easyconfigs/l/LLVM/LLVM-3.6.2-intel-2015a-Python-2.7.9.eb
+++ b/easybuild/easyconfigs/l/LLVM/LLVM-3.6.2-intel-2015a-Python-2.7.9.eb
@@ -29,8 +29,8 @@ builddependencies = [
 configopts = '-DBUILD_SHARED_LIBS=ON '
 
 sanity_check_paths = {
-    'files' : ['bin/llvm-ar'],
-    'dirs' : ['include/llvm', 'include/llvm-c'],
+    'files': ['bin/llvm-ar'],
+    'dirs': ['include/llvm', 'include/llvm-c'],
 }
 
 separate_build_dir = True
diff --git a/easybuild/easyconfigs/l/LLVM/LLVM-3.6.2-intel-2015a.eb b/easybuild/easyconfigs/l/LLVM/LLVM-3.6.2-intel-2015a.eb
index 0e2be216c94c5ae847a28bccbafc9b00711ebf4e..bb160486fdbcbc7fafc9c8c451d2fe9bc5776a2d 100644
--- a/easybuild/easyconfigs/l/LLVM/LLVM-3.6.2-intel-2015a.eb
+++ b/easybuild/easyconfigs/l/LLVM/LLVM-3.6.2-intel-2015a.eb
@@ -26,8 +26,8 @@ builddependencies = [
 configopts = '-DBUILD_SHARED_LIBS=ON '
 
 sanity_check_paths = {
-    'files' : ['bin/llvm-ar'],
-    'dirs' : ['include/llvm', 'include/llvm-c'],
+    'files': ['bin/llvm-ar'],
+    'dirs': ['include/llvm', 'include/llvm-c'],
 }
 
 separate_build_dir = True
diff --git a/easybuild/easyconfigs/l/LLVM/LLVM-3.6.2-intel-2015b.eb b/easybuild/easyconfigs/l/LLVM/LLVM-3.6.2-intel-2015b.eb
index ae23f4c83c569087505aa45c2f502dbb273ab3e3..435d7783c6b22e5b8d3fc5f667a02cb91663af90 100644
--- a/easybuild/easyconfigs/l/LLVM/LLVM-3.6.2-intel-2015b.eb
+++ b/easybuild/easyconfigs/l/LLVM/LLVM-3.6.2-intel-2015b.eb
@@ -26,8 +26,8 @@ builddependencies = [
 configopts = '-DBUILD_SHARED_LIBS=ON '
 
 sanity_check_paths = {
-    'files' : ['bin/llvm-ar'],
-    'dirs' : ['include/llvm', 'include/llvm-c'],
+    'files': ['bin/llvm-ar'],
+    'dirs': ['include/llvm', 'include/llvm-c'],
 }
 
 separate_build_dir = True
diff --git a/easybuild/easyconfigs/l/LLVM/LLVM-3.7.0-intel-2015a.eb b/easybuild/easyconfigs/l/LLVM/LLVM-3.7.0-intel-2015a.eb
index 622b77ee482378dbd02727ca5412e6bf82c328c4..88dcd9047867d30ca5b8a0c111b1bec54b96aca1 100644
--- a/easybuild/easyconfigs/l/LLVM/LLVM-3.7.0-intel-2015a.eb
+++ b/easybuild/easyconfigs/l/LLVM/LLVM-3.7.0-intel-2015a.eb
@@ -26,8 +26,8 @@ builddependencies = [
 configopts = '-DBUILD_SHARED_LIBS=ON '
 
 sanity_check_paths = {
-    'files' : ['bin/llvm-ar'],
-    'dirs' : ['include/llvm', 'include/llvm-c'],
+    'files': ['bin/llvm-ar'],
+    'dirs': ['include/llvm', 'include/llvm-c'],
 }
 
 separate_build_dir = True
diff --git a/easybuild/easyconfigs/l/LLVM/LLVM-3.7.0-intel-2015b.eb b/easybuild/easyconfigs/l/LLVM/LLVM-3.7.0-intel-2015b.eb
index b7b0fd0d07c8f0ab1280f74047cea5370969f3df..28f4906cec6f4e6f3ee2b9e59932cbc48d0f7ca9 100644
--- a/easybuild/easyconfigs/l/LLVM/LLVM-3.7.0-intel-2015b.eb
+++ b/easybuild/easyconfigs/l/LLVM/LLVM-3.7.0-intel-2015b.eb
@@ -26,8 +26,8 @@ builddependencies = [
 configopts = '-DBUILD_SHARED_LIBS=ON -DCMAKE_EXE_LINKER_FLAGS="$LDFLAGS -shared-intel" '
 
 sanity_check_paths = {
-    'files' : ['bin/llvm-ar'],
-    'dirs' : ['include/llvm', 'include/llvm-c'],
+    'files': ['bin/llvm-ar'],
+    'dirs': ['include/llvm', 'include/llvm-c'],
 }
 
 separate_build_dir = True
diff --git a/easybuild/easyconfigs/l/LLVM/LLVM-3.7.1-foss-2016a.eb b/easybuild/easyconfigs/l/LLVM/LLVM-3.7.1-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..eca1371a7b53b300d83b9c90a449b784d6cb97c7
--- /dev/null
+++ b/easybuild/easyconfigs/l/LLVM/LLVM-3.7.1-foss-2016a.eb
@@ -0,0 +1,34 @@
+easyblock = 'CMakeMake'
+
+name = 'LLVM'
+version = '3.7.1'
+
+homepage = "http://llvm.org/"
+description = """The LLVM Core libraries provide a modern source- and target-independent
+ optimizer, along with code generation support for many popular CPUs
+ (as well as some less common ones!) These libraries are built around a well
+ specified code representation known as the LLVM intermediate representation
+ ("LLVM IR"). The LLVM Core libraries are well documented, and it is
+ particularly easy to invent your own language (or port an existing compiler)
+ to use LLVM as an optimizer and code generator."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = ["http://llvm.org/releases/%(version)s"]
+sources = ["llvm-%(version)s.src.tar.xz"]
+
+builddependencies = [
+    ('CMake', '3.4.3'),
+    ('Python', '2.7.11'),
+]
+
+configopts = '-DBUILD_SHARED_LIBS=ON'
+
+sanity_check_paths = {
+    'files' : ['bin/llvm-ar'],
+    'dirs' : ['include/llvm', 'include/llvm-c'],
+}
+
+separate_build_dir = True
+
+moduleclass = 'compiler'
diff --git a/easybuild/easyconfigs/l/LLVM/LLVM-3.7.1-intel-2015b.eb b/easybuild/easyconfigs/l/LLVM/LLVM-3.7.1-intel-2015b.eb
index e0f3bf3a62cd4a951990eaa2d0f71cdcf984c7d1..4bf8e3225fac988f8d048aec3012230a6400738c 100644
--- a/easybuild/easyconfigs/l/LLVM/LLVM-3.7.1-intel-2015b.eb
+++ b/easybuild/easyconfigs/l/LLVM/LLVM-3.7.1-intel-2015b.eb
@@ -26,8 +26,8 @@ builddependencies = [
 configopts = '-DBUILD_SHARED_LIBS=ON -DCMAKE_EXE_LINKER_FLAGS="$LDFLAGS -shared-intel" '
 
 sanity_check_paths = {
-    'files' : ['bin/llvm-ar'],
-    'dirs' : ['include/llvm', 'include/llvm-c'],
+    'files': ['bin/llvm-ar'],
+    'dirs': ['include/llvm', 'include/llvm-c'],
 }
 
 separate_build_dir = True
diff --git a/easybuild/easyconfigs/l/LLVM/LLVM-3.7.1-intel-2016a.eb b/easybuild/easyconfigs/l/LLVM/LLVM-3.7.1-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..2605ca36ca0ca8d3590477ee1943d1fcfb092b67
--- /dev/null
+++ b/easybuild/easyconfigs/l/LLVM/LLVM-3.7.1-intel-2016a.eb
@@ -0,0 +1,35 @@
+easyblock = 'CMakeMake'
+
+name = 'LLVM'
+version = '3.7.1'
+
+homepage = "http://llvm.org/"
+description = """The LLVM Core libraries provide a modern source- and target-independent
+ optimizer, along with code generation support for many popular CPUs
+ (as well as some less common ones!) These libraries are built around a well
+ specified code representation known as the LLVM intermediate representation
+ ("LLVM IR"). The LLVM Core libraries are well documented, and it is
+ particularly easy to invent your own language (or port an existing compiler)
+ to use LLVM as an optimizer and code generator."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+toolchainopts = {'cstd': 'gnu++11'}
+
+source_urls = ["http://llvm.org/releases/%(version)s"]
+sources = ["llvm-%(version)s.src.tar.xz"]
+
+builddependencies = [
+    ('CMake', '3.4.3'),
+    ('Python', '2.7.11'),
+]
+
+configopts = '-DBUILD_SHARED_LIBS=ON -DCMAKE_EXE_LINKER_FLAGS="$LDFLAGS -shared-intel" '
+
+sanity_check_paths = {
+    'files': ['bin/llvm-ar'],
+    'dirs': ['include/llvm', 'include/llvm-c'],
+}
+
+separate_build_dir = True
+
+moduleclass = 'compiler'
diff --git a/easybuild/easyconfigs/l/LZO/LZO-2.06-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/l/LZO/LZO-2.06-goalf-1.1.0-no-OFED.eb
index 01b0d95ad8f754c6941bbe4405748e3bfcaad3d1..94a0908fdcc1054a4d760a06914c9033c6ec0573 100644
--- a/easybuild/easyconfigs/l/LZO/LZO-2.06-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/l/LZO/LZO-2.06-goalf-1.1.0-no-OFED.eb
@@ -21,11 +21,11 @@ source_urls = [homepage + 'download/']
 toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
 
 sanity_check_paths = {
-                      'files': [],
-                      'dirs': ['lib', 'include']
-                     }
+    'files': [],
+    'dirs': ['lib', 'include']
+}
 
-runtest= 'test'
+runtest = 'test'
 
 parallel = 1    # this is a very conservative choice
 
diff --git a/easybuild/easyconfigs/l/LZO/LZO-2.06-goolf-1.4.10.eb b/easybuild/easyconfigs/l/LZO/LZO-2.06-goolf-1.4.10.eb
index 4244d4fadb4a68e79bb0c397734a6c253c226d93..82b1a9bd7b38c44492a92f66060823e101955a1d 100644
--- a/easybuild/easyconfigs/l/LZO/LZO-2.06-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/l/LZO/LZO-2.06-goolf-1.4.10.eb
@@ -21,11 +21,11 @@ source_urls = [homepage + 'download/']
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 
 sanity_check_paths = {
-                      'files': [],
-                      'dirs': ['lib', 'include']
-                     }
+    'files': [],
+    'dirs': ['lib', 'include']
+}
 
-runtest= 'test'
+runtest = 'test'
 
 parallel = 1    # this is a very conservative choice
 
diff --git a/easybuild/easyconfigs/l/LZO/LZO-2.06-ictce-4.0.6.eb b/easybuild/easyconfigs/l/LZO/LZO-2.06-ictce-4.0.6.eb
index 115d1188ad4fef8b3801d19cfc2ede260a2291b2..3dc6b8939e99b2dab5168fd4013122d4324bdeaf 100644
--- a/easybuild/easyconfigs/l/LZO/LZO-2.06-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/l/LZO/LZO-2.06-ictce-4.0.6.eb
@@ -21,11 +21,11 @@ source_urls = [homepage + 'download/']
 toolchain = {'name': 'ictce', 'version': '4.0.6'}
 
 sanity_check_paths = {
-                      'files': [],
-                      'dirs': ['lib', 'include']
-                     }
+    'files': [],
+    'dirs': ['lib', 'include']
+}
 
-runtest= 'test'
+runtest = 'test'
 
 parallel = 1    # this is a very conservative choice
 
diff --git a/easybuild/easyconfigs/l/LZO/LZO-2.06-ictce-5.1.1.eb b/easybuild/easyconfigs/l/LZO/LZO-2.06-ictce-5.1.1.eb
index 266ce97e2594b5250d65392e23b855937d53e2af..91bc730999e90b356f9e90766951d30c17c4f105 100644
--- a/easybuild/easyconfigs/l/LZO/LZO-2.06-ictce-5.1.1.eb
+++ b/easybuild/easyconfigs/l/LZO/LZO-2.06-ictce-5.1.1.eb
@@ -21,11 +21,11 @@ source_urls = [homepage + 'download/']
 toolchain = {'name': 'ictce', 'version': '5.1.1'}
 
 sanity_check_paths = {
-                      'files': [],
-                      'dirs': ['lib', 'include']
-                     }
+    'files': [],
+    'dirs': ['lib', 'include']
+}
 
-runtest= 'test'
+runtest = 'test'
 
 parallel = 1    # this is a very conservative choice
 
diff --git a/easybuild/easyconfigs/l/LZO/LZO-2.06-ictce-5.3.0.eb b/easybuild/easyconfigs/l/LZO/LZO-2.06-ictce-5.3.0.eb
index d1e8d56383e4ec42535975179f32cd5050132d56..5b7a6a1f5c6cac6779c4402d8c2e5dea42fa3f2e 100644
--- a/easybuild/easyconfigs/l/LZO/LZO-2.06-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/l/LZO/LZO-2.06-ictce-5.3.0.eb
@@ -21,11 +21,11 @@ source_urls = [homepage + 'download/']
 toolchain = {'name': 'ictce', 'version': '5.3.0'}
 
 sanity_check_paths = {
-                      'files': [],
-                      'dirs': ['lib', 'include']
-                     }
+    'files': [],
+    'dirs': ['lib', 'include']
+}
 
-runtest= 'test'
+runtest = 'test'
 
 parallel = 1    # this is a very conservative choice
 
diff --git a/easybuild/easyconfigs/l/LibTIFF/LibTIFF-4.0.6-foss-2015a.eb b/easybuild/easyconfigs/l/LibTIFF/LibTIFF-4.0.6-foss-2015a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..68f9ad3dc97fc0d8db8af1ad630c8f88b647f312
--- /dev/null
+++ b/easybuild/easyconfigs/l/LibTIFF/LibTIFF-4.0.6-foss-2015a.eb
@@ -0,0 +1,34 @@
+# Built with EasyBuild version 2.2.0dev on 2015-06-16_10-51-42
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2012-2014 Uni.Lu/LCSB, NTUA
+# Authors::   Fotis Georgatos <fotis@cern.ch>
+# License::   MIT/GPL
+# $Id$
+#
+# This work implements a part of the HPCBIOS project and is a component of the policy:
+# http://hpcbios.readthedocs.org/en/latest/
+##
+easyblock = 'ConfigureMake'
+
+name = 'LibTIFF'
+version = '4.0.6'
+
+homepage = 'http://www.remotesensing.org/libtiff/'
+description = "tiff: Library and tools for reading and writing TIFF data files"
+
+toolchain = {'name': 'foss', 'version': '2015a'}
+
+source_urls = [
+    'http://download.osgeo.org/libtiff/',
+    'ftp://ftp.remotesensing.org/pub/libtiff/',
+]
+sources = ['tiff-%(version)s.tar.gz']
+
+sanity_check_paths = {
+    'files': ['bin/tiffinfo'],
+    'dirs': [],
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/LibTIFF/LibTIFF-4.0.6-intel-2016a.eb b/easybuild/easyconfigs/l/LibTIFF/LibTIFF-4.0.6-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..ed490e66de6f7d517217c815e217ea5fd187210a
--- /dev/null
+++ b/easybuild/easyconfigs/l/LibTIFF/LibTIFF-4.0.6-intel-2016a.eb
@@ -0,0 +1,33 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2012-2014 Uni.Lu/LCSB, NTUA
+# Authors::   Fotis Georgatos <fotis@cern.ch>, Alan O'Cais (JSC)
+# License::   MIT/GPL
+# $Id$
+#
+# This work implements a part of the HPCBIOS project and is a component of the policy:
+# http://hpcbios.readthedocs.org/en/latest/
+##
+easyblock = 'ConfigureMake'
+
+name = 'LibTIFF'
+version = '4.0.6'
+
+homepage = 'http://www.remotesensing.org/libtiff/'
+description = "tiff: Library and tools for reading and writing TIFF data files"
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+source_urls = [
+    'http://download.osgeo.org/libtiff/',
+    'ftp://ftp.remotesensing.org/pub/libtiff/',
+]
+sources = ['tiff-%(version)s.tar.gz']
+
+sanity_check_paths = {
+    'files': ['bin/tiffinfo'],
+    'dirs': [],
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/LibUUID/LibUUID-1.0.3-intel-2015a.eb b/easybuild/easyconfigs/l/LibUUID/LibUUID-1.0.3-intel-2015a.eb
index 579d4bd9955cbfcea8e9469a51c5f5b3f6f4c2f6..4d767e1cf33b46708709a59c26dd87298df65576 100644
--- a/easybuild/easyconfigs/l/LibUUID/LibUUID-1.0.3-intel-2015a.eb
+++ b/easybuild/easyconfigs/l/LibUUID/LibUUID-1.0.3-intel-2015a.eb
@@ -8,11 +8,11 @@ description = """Portable uuid C library"""
 
 toolchain = {'name': 'intel', 'version': '2015a'}
 
-source_urls  = [SOURCEFORGE_SOURCE]
+source_urls = [SOURCEFORGE_SOURCE]
 sources = [SOURCELOWER_TAR_GZ]
 
 sanity_check_paths = {
-    'files' : ['include/uuid/uuid.h', 'lib/libuuid.a','lib/libuuid.%s' % SHLIB_EXT],
+    'files': ['include/uuid/uuid.h', 'lib/libuuid.a', 'lib/libuuid.%s' % SHLIB_EXT],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/l/LibUUID/LibUUID-1.0.3-intel-2015b.eb b/easybuild/easyconfigs/l/LibUUID/LibUUID-1.0.3-intel-2015b.eb
index 052b80a1b3eaab21a237851c35906c2f95893963..d231b0ce29995cd28e93f9bbe4e1c6344561a35a 100644
--- a/easybuild/easyconfigs/l/LibUUID/LibUUID-1.0.3-intel-2015b.eb
+++ b/easybuild/easyconfigs/l/LibUUID/LibUUID-1.0.3-intel-2015b.eb
@@ -8,11 +8,11 @@ description = """Portable uuid C library"""
 
 toolchain = {'name': 'intel', 'version': '2015b'}
 
-source_urls  = [SOURCEFORGE_SOURCE]
+source_urls = [SOURCEFORGE_SOURCE]
 sources = [SOURCELOWER_TAR_GZ]
 
 sanity_check_paths = {
-    'files' : ['include/uuid/uuid.h', 'lib/libuuid.a','lib/libuuid.%s' % SHLIB_EXT],
+    'files': ['include/uuid/uuid.h', 'lib/libuuid.a', 'lib/libuuid.%s' % SHLIB_EXT],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/l/Libint/Libint-1.1.4-foss-2015b.eb b/easybuild/easyconfigs/l/Libint/Libint-1.1.4-foss-2015b.eb
index ba9b735bea8175f438671d27fa45c371e20354a5..8892a51e3b462c14419c1eb7de4186849269c054 100644
--- a/easybuild/easyconfigs/l/Libint/Libint-1.1.4-foss-2015b.eb
+++ b/easybuild/easyconfigs/l/Libint/Libint-1.1.4-foss-2015b.eb
@@ -18,7 +18,7 @@ sanity_check_paths = {
              ['include/libint/hrr_header.h', 'include/libint/vrr_header.h'] +
              ['lib/lib%s.a' % x for x in ['deriv', 'int', 'r12']] +
              ['lib/lib%s.so' % x for x in ['deriv', 'int', 'r12']],
-    'dirs':[],
+    'dirs': [],
 }
 
 moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/l/Libint/Libint-1.1.4-gmacml-1.7.0.eb b/easybuild/easyconfigs/l/Libint/Libint-1.1.4-gmacml-1.7.0.eb
index 2c0f30db6f2ffeb1bd29599452e66d6b379ba345..d9c94abb26021d005b454d7694cb9fe8b3199311 100644
--- a/easybuild/easyconfigs/l/Libint/Libint-1.1.4-gmacml-1.7.0.eb
+++ b/easybuild/easyconfigs/l/Libint/Libint-1.1.4-gmacml-1.7.0.eb
@@ -18,7 +18,7 @@ sanity_check_paths = {
              ['include/libint/hrr_header.h', 'include/libint/vrr_header.h'] +
              ['lib/lib%s.a' % x for x in ['deriv', 'int', 'r12']] +
              ['lib/lib%s.so' % x for x in ['deriv', 'int', 'r12']],
-    'dirs':[],
+    'dirs': [],
 }
 
 moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/l/Libint/Libint-1.1.4-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/l/Libint/Libint-1.1.4-goalf-1.1.0-no-OFED.eb
index 03c9b2dc7a7b076ebb51e9005a4fa43c5953a7b2..c04b9aefa2dd85df30cd9d601fca97bbd50419e0 100644
--- a/easybuild/easyconfigs/l/Libint/Libint-1.1.4-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/l/Libint/Libint-1.1.4-goalf-1.1.0-no-OFED.eb
@@ -18,7 +18,7 @@ sanity_check_paths = {
              ['include/libint/hrr_header.h', 'include/libint/vrr_header.h'] +
              ['lib/lib%s.a' % x for x in ['deriv', 'int', 'r12']] +
              ['lib/lib%s.so' % x for x in ['deriv', 'int', 'r12']],
-    'dirs':[],
+    'dirs': [],
 }
 
 moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/l/Libint/Libint-1.1.4-goolf-1.4.10.eb b/easybuild/easyconfigs/l/Libint/Libint-1.1.4-goolf-1.4.10.eb
index 730a15d185cecbc1d6bf034318679ddf15b8ebf7..2a492f12bccd33c643905bb739a16e8249838321 100644
--- a/easybuild/easyconfigs/l/Libint/Libint-1.1.4-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/l/Libint/Libint-1.1.4-goolf-1.4.10.eb
@@ -17,7 +17,7 @@ sanity_check_paths = {
              ['include/libint/hrr_header.h', 'include/libint/vrr_header.h'] +
              ['lib/lib%s.a' % x for x in ['deriv', 'int', 'r12']] +
              ['lib/lib%s.so' % x for x in ['deriv', 'int', 'r12']],
-    'dirs':[],
+    'dirs': [],
 }
 
 moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/l/Libint/Libint-1.1.4-ictce-3.2.2.u3.eb b/easybuild/easyconfigs/l/Libint/Libint-1.1.4-ictce-3.2.2.u3.eb
index f3c3b23d4adb62c1e3a4c3ddd3c1f5976654331b..43b19b6334b5a344e38b7f756c9343ee8f93582f 100644
--- a/easybuild/easyconfigs/l/Libint/Libint-1.1.4-ictce-3.2.2.u3.eb
+++ b/easybuild/easyconfigs/l/Libint/Libint-1.1.4-ictce-3.2.2.u3.eb
@@ -18,7 +18,7 @@ sanity_check_paths = {
              ['include/libint/hrr_header.h', 'include/libint/vrr_header.h'] +
              ['lib/lib%s.a' % x for x in ['deriv', 'int', 'r12']] +
              ['lib/lib%s.so' % x for x in ['deriv', 'int', 'r12']],
-    'dirs':[],
+    'dirs': [],
 }
 
 moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/l/Libint/Libint-1.1.4-ictce-4.1.13.eb b/easybuild/easyconfigs/l/Libint/Libint-1.1.4-ictce-4.1.13.eb
index 4e57ea250063a2c3db802b1e7cf413fddac53f2d..148e3670c0d67ac55ebdfcab2948c35a6012d692 100644
--- a/easybuild/easyconfigs/l/Libint/Libint-1.1.4-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/l/Libint/Libint-1.1.4-ictce-4.1.13.eb
@@ -18,7 +18,7 @@ sanity_check_paths = {
              ['include/libint/hrr_header.h', 'include/libint/vrr_header.h'] +
              ['lib/lib%s.a' % x for x in ['deriv', 'int', 'r12']] +
              ['lib/lib%s.so' % x for x in ['deriv', 'int', 'r12']],
-    'dirs':[],
+    'dirs': [],
 }
 
 moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/l/Libint/Libint-1.1.4-ictce-5.3.0.eb b/easybuild/easyconfigs/l/Libint/Libint-1.1.4-ictce-5.3.0.eb
index 785e595968d71797d4aa007af6ac2af4c9e4bffe..df06fc7ec9d254858e2ba6cb1358093eeb418616 100644
--- a/easybuild/easyconfigs/l/Libint/Libint-1.1.4-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/l/Libint/Libint-1.1.4-ictce-5.3.0.eb
@@ -18,7 +18,7 @@ sanity_check_paths = {
              ['include/libint/hrr_header.h', 'include/libint/vrr_header.h'] +
              ['lib/lib%s.a' % x for x in ['deriv', 'int', 'r12']] +
              ['lib/lib%s.so' % x for x in ['deriv', 'int', 'r12']],
-    'dirs':[],
+    'dirs': [],
 }
 
 moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/l/Libint/Libint-1.1.4-ictce-5.5.0.eb b/easybuild/easyconfigs/l/Libint/Libint-1.1.4-ictce-5.5.0.eb
index 401ec7cb9e47739b5a9c4bfb5c8ddbb617f4de9e..edcbb88f18c52a059bc6c5c2507643a5c261e8c7 100644
--- a/easybuild/easyconfigs/l/Libint/Libint-1.1.4-ictce-5.5.0.eb
+++ b/easybuild/easyconfigs/l/Libint/Libint-1.1.4-ictce-5.5.0.eb
@@ -18,7 +18,7 @@ sanity_check_paths = {
              ['include/libint/hrr_header.h', 'include/libint/vrr_header.h'] +
              ['lib/lib%s.a' % x for x in ['deriv', 'int', 'r12']] +
              ['lib/lib%s.so' % x for x in ['deriv', 'int', 'r12']],
-    'dirs':[],
+    'dirs': [],
 }
 
 moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/l/Libint/Libint-1.1.4-intel-2014b.eb b/easybuild/easyconfigs/l/Libint/Libint-1.1.4-intel-2014b.eb
index e84c9a7220ec3db189163a600de0e656b4dbd379..e0416eeeb5da0cbf48842f3b4b4bc3d7c669acb7 100644
--- a/easybuild/easyconfigs/l/Libint/Libint-1.1.4-intel-2014b.eb
+++ b/easybuild/easyconfigs/l/Libint/Libint-1.1.4-intel-2014b.eb
@@ -18,7 +18,7 @@ sanity_check_paths = {
              ['include/libint/hrr_header.h', 'include/libint/vrr_header.h'] +
              ['lib/lib%s.a' % x for x in ['deriv', 'int', 'r12']] +
              ['lib/lib%s.so' % x for x in ['deriv', 'int', 'r12']],
-    'dirs':[],
+    'dirs': [],
 }
 
 moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/l/Libint/Libint-1.1.4-intel-2015a.eb b/easybuild/easyconfigs/l/Libint/Libint-1.1.4-intel-2015a.eb
index 2cf26e1b10bdc05493e6407c1a399996d2445506..eff3b17ce61100bfcf9f04f0e1c8d5f570fde1d0 100644
--- a/easybuild/easyconfigs/l/Libint/Libint-1.1.4-intel-2015a.eb
+++ b/easybuild/easyconfigs/l/Libint/Libint-1.1.4-intel-2015a.eb
@@ -18,7 +18,7 @@ sanity_check_paths = {
              ['include/libint/hrr_header.h', 'include/libint/vrr_header.h'] +
              ['lib/lib%s.a' % x for x in ['deriv', 'int', 'r12']] +
              ['lib/lib%s.so' % x for x in ['deriv', 'int', 'r12']],
-    'dirs':[],
+    'dirs': [],
 }
 
 moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/l/Libint/Libint-1.1.4-intel-2015b.eb b/easybuild/easyconfigs/l/Libint/Libint-1.1.4-intel-2015b.eb
index 1e71a38b555915bd997380294f0e7a6549acb613..0728b4341fa0725445a9a9768f2f9d968a5e5642 100644
--- a/easybuild/easyconfigs/l/Libint/Libint-1.1.4-intel-2015b.eb
+++ b/easybuild/easyconfigs/l/Libint/Libint-1.1.4-intel-2015b.eb
@@ -18,7 +18,7 @@ sanity_check_paths = {
              ['include/libint/hrr_header.h', 'include/libint/vrr_header.h'] +
              ['lib/lib%s.a' % x for x in ['deriv', 'int', 'r12']] +
              ['lib/lib%s.so' % x for x in ['deriv', 'int', 'r12']],
-    'dirs':[],
+    'dirs': [],
 }
 
 moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/l/Libint/Libint-1.1.4-intel-para-2014.12.eb b/easybuild/easyconfigs/l/Libint/Libint-1.1.4-intel-para-2014.12.eb
index 131e4988f11c6622eefb3c256c1026d1b0ca6fa2..44424f9578343e28658d9dbfceab984169890a8c 100644
--- a/easybuild/easyconfigs/l/Libint/Libint-1.1.4-intel-para-2014.12.eb
+++ b/easybuild/easyconfigs/l/Libint/Libint-1.1.4-intel-para-2014.12.eb
@@ -17,7 +17,7 @@ sanity_check_paths = {
     'files': ["include/lib%(x)s/lib%(x)s.h" % {'x': x} for x in ["deriv", "int", "r12"]] +
              ["include/libint/hrr_header.h", "include/libint/vrr_header.h"] +
              ["lib/lib%s.a" % x for x in ["deriv", "int", "r12"]],
-    'dirs':[],
+    'dirs': [],
 }
 
 moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/l/LittleCMS/LittleCMS-2.7-goolf-1.4.10.eb b/easybuild/easyconfigs/l/LittleCMS/LittleCMS-2.7-goolf-1.4.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..bea932c18dc0429462c8d32777e5589208096495
--- /dev/null
+++ b/easybuild/easyconfigs/l/LittleCMS/LittleCMS-2.7-goolf-1.4.10.eb
@@ -0,0 +1,23 @@
+easyblock = 'ConfigureMake'
+
+name = 'LittleCMS'
+version = '2.7'
+
+homepage = 'http://www.littlecms.com/'
+description = """ Little CMS intends to be an OPEN SOURCE small-footprint color management engine, 
+ with special focus on accuracy and performance. """
+
+toolchain = {'name': 'goolf', 'version': '1.4.10'}
+
+source_urls = ['http://sourceforge.net/projects/lcms/files/lcms/%(version)s/']
+sources = ['lcms2-%(version)s.tar.gz']
+
+dependencies = [('libjpeg-turbo', '1.4.2')]
+
+sanity_check_paths = {
+    'files': ['bin/jpgicc', 'bin/linkicc', 'bin/psicc', 'bin/transicc', 'include/lcms2.h', 'include/lcms2_plugin.h',
+              'lib/liblcms2.a', 'lib/liblcms2.%s' % SHLIB_EXT, 'lib/pkgconfig/lcms2.pc'],
+    'dirs': ['share/man'],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/l/lftp/lftp-4.4.1-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/l/lftp/lftp-4.4.1-goalf-1.1.0-no-OFED.eb
index 36b7df3cbbbfa1e5659c2b02b80195cbd77c3d45..143cec914499e94920e6bc42271f4fdd68367912 100644
--- a/easybuild/easyconfigs/l/lftp/lftp-4.4.1-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/l/lftp/lftp-4.4.1-goalf-1.1.0-no-OFED.eb
@@ -26,15 +26,15 @@ toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
 # fi. http://ftp.yar.ru/pub/source/lftp/lftp-4.4.1.tar.bz2
 sources = [SOURCE_TAR_BZ2]
 source_urls = [
-               'http://ftp.yar.ru/pub/source/lftp/',
-               'http://ftp.yar.ru/pub/source/lftp/old/',
-              ]
+    'http://ftp.yar.ru/pub/source/lftp/',
+    'http://ftp.yar.ru/pub/source/lftp/old/',
+]
 
 dependencies = [('gnutls', '3.1.8')]
 
 sanity_check_paths = {
-                      'files': ['bin/lftp'],
-                      'dirs': []
-                     }
+    'files': ['bin/lftp'],
+    'dirs': []
+}
 
 moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/l/lftp/lftp-4.4.1-goolf-1.4.10.eb b/easybuild/easyconfigs/l/lftp/lftp-4.4.1-goolf-1.4.10.eb
index 9d1f79e19b05d2611b7ec05f73f4869f827c8503..e96735ec2cf1d29cb7687c0356336456731fab88 100644
--- a/easybuild/easyconfigs/l/lftp/lftp-4.4.1-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/l/lftp/lftp-4.4.1-goolf-1.4.10.eb
@@ -25,15 +25,15 @@ toolchain = {'name': 'goolf', 'version': '1.4.10'}
 # fi. http://ftp.yar.ru/pub/source/lftp/lftp-4.4.1.tar.bz2
 sources = [SOURCE_TAR_BZ2]
 source_urls = [
-               'http://ftp.yar.ru/pub/source/lftp/',
-               'http://ftp.yar.ru/pub/source/lftp/old/',
-              ]
+    'http://ftp.yar.ru/pub/source/lftp/',
+    'http://ftp.yar.ru/pub/source/lftp/old/',
+]
 
 dependencies = [('gnutls', '3.1.8')]
 
 sanity_check_paths = {
-                      'files': ['bin/lftp'],
-                      'dirs': []
-                     }
+    'files': ['bin/lftp'],
+    'dirs': []
+}
 
 moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/l/libGLU/libGLU-9.0.0-intel-2015a-Python-2.7.10.eb b/easybuild/easyconfigs/l/libGLU/libGLU-9.0.0-intel-2015a-Python-2.7.10.eb
index 8b9006f86dfeda097f60c6aae03b405ba772e972..c4c01e4178269838fbe4dfeaffe20fd30400f176 100644
--- a/easybuild/easyconfigs/l/libGLU/libGLU-9.0.0-intel-2015a-Python-2.7.10.eb
+++ b/easybuild/easyconfigs/l/libGLU/libGLU-9.0.0-intel-2015a-Python-2.7.10.eb
@@ -18,8 +18,8 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files' : ['lib/libGLU.so.1'],
-    'dirs' : [],
+    'files': ['lib/libGLU.so.1'],
+    'dirs': [],
 }
 
 moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/l/libGLU/libGLU-9.0.0-intel-2015b-Mesa-11.0.8.eb b/easybuild/easyconfigs/l/libGLU/libGLU-9.0.0-intel-2015b-Mesa-11.0.8.eb
index 2d27e3100e5c130325fcfc005bb5ecd72c719a69..1d535efa3e46b37f9b4852c9fa5c7f0af5c43067 100644
--- a/easybuild/easyconfigs/l/libGLU/libGLU-9.0.0-intel-2015b-Mesa-11.0.8.eb
+++ b/easybuild/easyconfigs/l/libGLU/libGLU-9.0.0-intel-2015b-Mesa-11.0.8.eb
@@ -20,8 +20,8 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files' : ['lib/libGLU.so.1'],
-    'dirs' : [],
+    'files': ['lib/libGLU.so.1'],
+    'dirs': [],
 }
 
 moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/l/libGLU/libGLU-9.0.0-intel-2015b.eb b/easybuild/easyconfigs/l/libGLU/libGLU-9.0.0-intel-2015b.eb
index c0145295eb1fbb6545f945df2bfa680827188dc9..bc9de7e0c8f1d5a05639800c6bd89417bb14e4b7 100644
--- a/easybuild/easyconfigs/l/libGLU/libGLU-9.0.0-intel-2015b.eb
+++ b/easybuild/easyconfigs/l/libGLU/libGLU-9.0.0-intel-2015b.eb
@@ -17,8 +17,8 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files' : ['lib/libGLU.so.1'],
-    'dirs' : [],
+    'files': ['lib/libGLU.so.1'],
+    'dirs': [],
 }
 
 moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/l/libICE/libICE-1.0.8-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libICE/libICE-1.0.8-goolf-1.4.10.eb
index e1317b6a068d5a7d4881024fc0c9ecac35b331bb..42c22fbb11b28fda991e666236c50ccba4306efd 100644
--- a/easybuild/easyconfigs/l/libICE/libICE-1.0.8-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/l/libICE/libICE-1.0.8-goolf-1.4.10.eb
@@ -17,8 +17,8 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files' : ['include/X11/ICE/ICE%s.h' % x for x in ['', 'conn', 'lib', 'msg', 'proto', 'util']],
-    'dirs' : [],
+    'files': ['include/X11/ICE/ICE%s.h' % x for x in ['', 'conn', 'lib', 'msg', 'proto', 'util']],
+    'dirs': [],
 }
 
 moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/l/libICE/libICE-1.0.8-goolf-1.5.14.eb b/easybuild/easyconfigs/l/libICE/libICE-1.0.8-goolf-1.5.14.eb
index fad83246f3a50415beaa72e7101a3dc38c2b03c3..45efaa2f599ab0b35d150aa75ffaef59646f8ac3 100644
--- a/easybuild/easyconfigs/l/libICE/libICE-1.0.8-goolf-1.5.14.eb
+++ b/easybuild/easyconfigs/l/libICE/libICE-1.0.8-goolf-1.5.14.eb
@@ -17,8 +17,8 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files' : ['include/X11/ICE/ICE%s.h' % x for x in ['', 'conn', 'lib', 'msg', 'proto', 'util']],
-    'dirs' : [],
+    'files': ['include/X11/ICE/ICE%s.h' % x for x in ['', 'conn', 'lib', 'msg', 'proto', 'util']],
+    'dirs': [],
 }
 
 moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/l/libICE/libICE-1.0.8-ictce-4.1.13.eb b/easybuild/easyconfigs/l/libICE/libICE-1.0.8-ictce-4.1.13.eb
index a224ca2f47bbf8b98502d087b2e00b659be3149d..cbf26ccb0e33cdcd5bba6a20441469eed960d27c 100644
--- a/easybuild/easyconfigs/l/libICE/libICE-1.0.8-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/l/libICE/libICE-1.0.8-ictce-4.1.13.eb
@@ -17,8 +17,8 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files' : ['include/X11/ICE/ICE%s.h' % x for x in ['', 'conn', 'lib', 'msg', 'proto', 'util']],
-    'dirs' : [],
+    'files': ['include/X11/ICE/ICE%s.h' % x for x in ['', 'conn', 'lib', 'msg', 'proto', 'util']],
+    'dirs': [],
 }
 
 moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/l/libICE/libICE-1.0.8-ictce-5.3.0.eb b/easybuild/easyconfigs/l/libICE/libICE-1.0.8-ictce-5.3.0.eb
index 84dfd42c65de33f08ed5aa160c6b6443a92a7841..c6c611bb2bf77dd77872709def3c66292d293d3f 100644
--- a/easybuild/easyconfigs/l/libICE/libICE-1.0.8-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/l/libICE/libICE-1.0.8-ictce-5.3.0.eb
@@ -17,8 +17,8 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files' : ['include/X11/ICE/ICE%s.h' % x for x in ['', 'conn', 'lib', 'msg', 'proto', 'util']],
-    'dirs' : [],
+    'files': ['include/X11/ICE/ICE%s.h' % x for x in ['', 'conn', 'lib', 'msg', 'proto', 'util']],
+    'dirs': [],
 }
 
 moduleclass = 'vis'
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 3280a4d8e4a2e337ee06f9c008cbd0c2ad66ce76..bb3839e6a656332beb122593752b4cd2aaaf64ef 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
@@ -21,8 +21,8 @@ builddependencies = [
 
 
 sanity_check_paths = {
-    'files' : ['include/X11/ICE/ICE%s.h' % x for x in ['', 'conn', 'lib', 'msg', 'proto', 'util']],
-    'dirs' : [],
+    'files': ['include/X11/ICE/ICE%s.h' % x for x in ['', 'conn', 'lib', 'msg', 'proto', 'util']],
+    'dirs': [],
 }
 
 moduleclass = 'vis'
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 c7f664c8c8ffd128e0c3438565970387e52714f8..0fb685525a9ab458f3e046a77cddb9c6b605bd98 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
@@ -20,8 +20,8 @@ builddependencies = [
 ]
 
 sanity_check_paths = {
-    'files' : ['include/X11/ICE/ICE%s.h' % x for x in ['', 'conn', 'lib', 'msg', 'proto', 'util']],
-    'dirs' : [],
+    'files': ['include/X11/ICE/ICE%s.h' % x for x in ['', 'conn', 'lib', 'msg', 'proto', 'util']],
+    'dirs': [],
 }
 
 moduleclass = 'vis'
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 87ccf251e183296c2c00f43ea63902b9c6c5c2d8..d28d3a6e76598182c9fe359a02891d3a95faa57f 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
@@ -20,8 +20,8 @@ builddependencies = [
 ]
 
 sanity_check_paths = {
-    'files' : ['include/X11/ICE/ICE%s.h' % x for x in ['', 'conn', 'lib', 'msg', 'proto', 'util']],
-    'dirs' : [],
+    'files': ['include/X11/ICE/ICE%s.h' % x for x in ['', 'conn', 'lib', 'msg', 'proto', 'util']],
+    'dirs': [],
 }
 
 moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/l/libSM/libSM-1.2.1-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libSM/libSM-1.2.1-goolf-1.4.10.eb
index aa6111e5a0718ca96a1d47028b23c6bf236b3c57..69237fa741e4848a9a18f3bf4f3ac2c95210c16e 100644
--- a/easybuild/easyconfigs/l/libSM/libSM-1.2.1-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/l/libSM/libSM-1.2.1-goolf-1.4.10.eb
@@ -21,8 +21,8 @@ builddependencies = [
 ]
 
 sanity_check_paths = {
-    'files' : ['include/X11/SM/%s' % x for x in ['SM.h', 'SMlib.h', 'SMproto.h']],
-    'dirs' : [],
+    'files': ['include/X11/SM/%s' % x for x in ['SM.h', 'SMlib.h', 'SMproto.h']],
+    'dirs': [],
 }
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/l/libSM/libSM-1.2.1-goolf-1.5.14.eb b/easybuild/easyconfigs/l/libSM/libSM-1.2.1-goolf-1.5.14.eb
index c115e440d52ef3bf6ef78a8d92099f8da116ab71..e7ecc39a17ff381aa4789b92bfbe824ae8fcdb72 100644
--- a/easybuild/easyconfigs/l/libSM/libSM-1.2.1-goolf-1.5.14.eb
+++ b/easybuild/easyconfigs/l/libSM/libSM-1.2.1-goolf-1.5.14.eb
@@ -21,8 +21,8 @@ builddependencies = [
 ]
 
 sanity_check_paths = {
-    'files' : ['include/X11/SM/%s' % x for x in ['SM.h', 'SMlib.h', 'SMproto.h']],
-    'dirs' : [],
+    'files': ['include/X11/SM/%s' % x for x in ['SM.h', 'SMlib.h', 'SMproto.h']],
+    'dirs': [],
 }
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/l/libSM/libSM-1.2.1-ictce-4.1.13.eb b/easybuild/easyconfigs/l/libSM/libSM-1.2.1-ictce-4.1.13.eb
index 14074eae88feec15f0c0215d24bd47045e6096db..de61279284a7f280c60177e66ee4f7326f0c15da 100644
--- a/easybuild/easyconfigs/l/libSM/libSM-1.2.1-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/l/libSM/libSM-1.2.1-ictce-4.1.13.eb
@@ -21,8 +21,8 @@ builddependencies = [
 ]
 
 sanity_check_paths = {
-    'files' : ['include/X11/SM/%s' % x for x in ['SM.h', 'SMlib.h', 'SMproto.h']],
-    'dirs' : [],
+    'files': ['include/X11/SM/%s' % x for x in ['SM.h', 'SMlib.h', 'SMproto.h']],
+    'dirs': [],
 }
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/l/libSM/libSM-1.2.1-ictce-5.3.0.eb b/easybuild/easyconfigs/l/libSM/libSM-1.2.1-ictce-5.3.0.eb
index ee47bc867f3c8eb5a2d1fa28bf640603a0602e4f..b2524399f7847b742508431c3a2cdbc696e70082 100644
--- a/easybuild/easyconfigs/l/libSM/libSM-1.2.1-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/l/libSM/libSM-1.2.1-ictce-5.3.0.eb
@@ -21,8 +21,8 @@ builddependencies = [
 ]
 
 sanity_check_paths = {
-    'files' : ['include/X11/SM/%s' % x for x in ['SM.h', 'SMlib.h', 'SMproto.h']],
-    'dirs' : [],
+    'files': ['include/X11/SM/%s' % x for x in ['SM.h', 'SMlib.h', 'SMproto.h']],
+    'dirs': [],
 }
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/l/libSM/libSM-1.2.1-intel-2014b.eb b/easybuild/easyconfigs/l/libSM/libSM-1.2.1-intel-2014b.eb
index 8182108112cee23c2ae5bfc0e334c939b66ad825..a15bba69ef0ac314ec20b4812bcab675c87addf0 100644
--- a/easybuild/easyconfigs/l/libSM/libSM-1.2.1-intel-2014b.eb
+++ b/easybuild/easyconfigs/l/libSM/libSM-1.2.1-intel-2014b.eb
@@ -21,8 +21,8 @@ builddependencies = [
 ]
 
 sanity_check_paths = {
-    'files' : ['include/X11/SM/%s' % x for x in ['SM.h', 'SMlib.h', 'SMproto.h']],
-    'dirs' : [],
+    'files': ['include/X11/SM/%s' % x for x in ['SM.h', 'SMlib.h', 'SMproto.h']],
+    'dirs': [],
 }
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/l/libSM/libSM-1.2.2-intel-2015a.eb b/easybuild/easyconfigs/l/libSM/libSM-1.2.2-intel-2015a.eb
index 7d8fcfe61addb4eda143576e468742909975f991..2a2391d84707047a1c92746781d8beb9550b813f 100644
--- a/easybuild/easyconfigs/l/libSM/libSM-1.2.2-intel-2015a.eb
+++ b/easybuild/easyconfigs/l/libSM/libSM-1.2.2-intel-2015a.eb
@@ -21,8 +21,8 @@ builddependencies = [
 ]
 
 sanity_check_paths = {
-    'files' : ['include/X11/SM/%s' % x for x in ['SM.h', 'SMlib.h', 'SMproto.h']],
-    'dirs' : [],
+    'files': ['include/X11/SM/%s' % x for x in ['SM.h', 'SMlib.h', 'SMproto.h']],
+    'dirs': [],
 }
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/l/libSM/libSM-1.2.2-intel-2015b.eb b/easybuild/easyconfigs/l/libSM/libSM-1.2.2-intel-2015b.eb
index 3cd80afcd1e3a89b3f5ed96393f65d023b626c90..641ea444768c8466cb450155f6ba31748e645a4c 100644
--- a/easybuild/easyconfigs/l/libSM/libSM-1.2.2-intel-2015b.eb
+++ b/easybuild/easyconfigs/l/libSM/libSM-1.2.2-intel-2015b.eb
@@ -21,8 +21,8 @@ builddependencies = [
 ]
 
 sanity_check_paths = {
-    'files' : ['include/X11/SM/%s' % x for x in ['SM.h', 'SMlib.h', 'SMproto.h']],
-    'dirs' : [],
+    'files': ['include/X11/SM/%s' % x for x in ['SM.h', 'SMlib.h', 'SMproto.h']],
+    'dirs': [],
 }
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/l/libX11/libX11-1.6.1-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libX11/libX11-1.6.1-goolf-1.4.10.eb
index 520bd74e88bf64c372bad405f73b3717ce4dc429..90e0e2d976ce7cd89dc8c00249de974eeec57a18 100644
--- a/easybuild/easyconfigs/l/libX11/libX11-1.6.1-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/l/libX11/libX11-1.6.1-goolf-1.4.10.eb
@@ -27,9 +27,9 @@ dependencies = [
 
 sanity_check_paths = {
     'files': ['include/X11/%s' % x for x in [
-            'cursorfont.h', 'ImUtil.h', 'Xcms.h', 'XKBlib.h', 'XlibConf.h', 'Xlib.h', 'Xlibint.h', 'Xlib-xcb.h',
-            'Xlocale.h', 'Xregion.h', 'Xresource.h', 'Xutil.h',
-        ]
+        'cursorfont.h', 'ImUtil.h', 'Xcms.h', 'XKBlib.h', 'XlibConf.h', 'Xlib.h', 'Xlibint.h', 'Xlib-xcb.h',
+        'Xlocale.h', 'Xregion.h', 'Xresource.h', 'Xutil.h',
+    ]
     ],
     'dirs': [],
 }
diff --git a/easybuild/easyconfigs/l/libX11/libX11-1.6.1-goolf-1.5.14.eb b/easybuild/easyconfigs/l/libX11/libX11-1.6.1-goolf-1.5.14.eb
index aee383b326ddb3e1d26de090713aee611b84663a..b7f55fcda109b0ee0160f27f842e4bb0142e6d5e 100644
--- a/easybuild/easyconfigs/l/libX11/libX11-1.6.1-goolf-1.5.14.eb
+++ b/easybuild/easyconfigs/l/libX11/libX11-1.6.1-goolf-1.5.14.eb
@@ -27,9 +27,9 @@ dependencies = [
 
 sanity_check_paths = {
     'files': ['include/X11/%s' % x for x in [
-            'cursorfont.h', 'ImUtil.h', 'Xcms.h', 'XKBlib.h', 'XlibConf.h', 'Xlib.h', 'Xlibint.h', 'Xlib-xcb.h',
-            'Xlocale.h', 'Xregion.h', 'Xresource.h', 'Xutil.h',
-        ]
+        'cursorfont.h', 'ImUtil.h', 'Xcms.h', 'XKBlib.h', 'XlibConf.h', 'Xlib.h', 'Xlibint.h', 'Xlib-xcb.h',
+        'Xlocale.h', 'Xregion.h', 'Xresource.h', 'Xutil.h',
+    ]
     ],
     'dirs': [],
 }
diff --git a/easybuild/easyconfigs/l/libX11/libX11-1.6.1-ictce-4.1.13.eb b/easybuild/easyconfigs/l/libX11/libX11-1.6.1-ictce-4.1.13.eb
index 693be4e80907f1b05908777f8821c90805ce69ff..89a1e29d9be7edb38d44c6b861e773d569527658 100644
--- a/easybuild/easyconfigs/l/libX11/libX11-1.6.1-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/l/libX11/libX11-1.6.1-ictce-4.1.13.eb
@@ -27,9 +27,9 @@ dependencies = [
 
 sanity_check_paths = {
     'files': ['include/X11/%s' % x for x in [
-            'cursorfont.h', 'ImUtil.h', 'Xcms.h', 'XKBlib.h', 'XlibConf.h', 'Xlib.h', 'Xlibint.h', 'Xlib-xcb.h',
-            'Xlocale.h', 'Xregion.h', 'Xresource.h', 'Xutil.h',
-        ]
+        'cursorfont.h', 'ImUtil.h', 'Xcms.h', 'XKBlib.h', 'XlibConf.h', 'Xlib.h', 'Xlibint.h', 'Xlib-xcb.h',
+        'Xlocale.h', 'Xregion.h', 'Xresource.h', 'Xutil.h',
+    ]
     ],
     'dirs': [],
 }
diff --git a/easybuild/easyconfigs/l/libX11/libX11-1.6.1-ictce-5.3.0.eb b/easybuild/easyconfigs/l/libX11/libX11-1.6.1-ictce-5.3.0.eb
index 0e6ea38eed897d61bc3403952abf528980fad74f..fddb03dd7fe61aca2952f1a3469097f29364a3ba 100644
--- a/easybuild/easyconfigs/l/libX11/libX11-1.6.1-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/l/libX11/libX11-1.6.1-ictce-5.3.0.eb
@@ -27,9 +27,9 @@ dependencies = [
 
 sanity_check_paths = {
     'files': ['include/X11/%s' % x for x in [
-            'cursorfont.h', 'ImUtil.h', 'Xcms.h', 'XKBlib.h', 'XlibConf.h', 'Xlib.h', 'Xlibint.h', 'Xlib-xcb.h',
-            'Xlocale.h', 'Xregion.h', 'Xresource.h', 'Xutil.h',
-        ]
+        'cursorfont.h', 'ImUtil.h', 'Xcms.h', 'XKBlib.h', 'XlibConf.h', 'Xlib.h', 'Xlibint.h', 'Xlib-xcb.h',
+        'Xlocale.h', 'Xregion.h', 'Xresource.h', 'Xutil.h',
+    ]
     ],
     'dirs': [],
 }
diff --git a/easybuild/easyconfigs/l/libX11/libX11-1.6.1-intel-2014b.eb b/easybuild/easyconfigs/l/libX11/libX11-1.6.1-intel-2014b.eb
index 893f0011c60909bfa8ead8684422b4ccf5cb7120..3522b7de999bcd34f1608722b5ebd4d85ca5cd52 100644
--- a/easybuild/easyconfigs/l/libX11/libX11-1.6.1-intel-2014b.eb
+++ b/easybuild/easyconfigs/l/libX11/libX11-1.6.1-intel-2014b.eb
@@ -27,9 +27,9 @@ dependencies = [
 
 sanity_check_paths = {
     'files': ['include/X11/%s' % x for x in [
-            'cursorfont.h', 'ImUtil.h', 'Xcms.h', 'XKBlib.h', 'XlibConf.h', 'Xlib.h', 'Xlibint.h', 'Xlib-xcb.h',
-            'Xlocale.h', 'Xregion.h', 'Xresource.h', 'Xutil.h',
-        ]
+        'cursorfont.h', 'ImUtil.h', 'Xcms.h', 'XKBlib.h', 'XlibConf.h', 'Xlib.h', 'Xlibint.h', 'Xlib-xcb.h',
+        'Xlocale.h', 'Xregion.h', 'Xresource.h', 'Xutil.h',
+    ]
     ],
     'dirs': [],
 }
diff --git a/easybuild/easyconfigs/l/libX11/libX11-1.6.2-foss-2014b-Python-2.7.8.eb b/easybuild/easyconfigs/l/libX11/libX11-1.6.2-foss-2014b-Python-2.7.8.eb
index 2f11de33483964c14e4a0f1287258a86c0965701..01231ac64085fdbcead80f0e55961556e99dbccb 100644
--- a/easybuild/easyconfigs/l/libX11/libX11-1.6.2-foss-2014b-Python-2.7.8.eb
+++ b/easybuild/easyconfigs/l/libX11/libX11-1.6.2-foss-2014b-Python-2.7.8.eb
@@ -27,9 +27,9 @@ dependencies = [
 
 sanity_check_paths = {
     'files': ['include/X11/%s' % x for x in [
-            'cursorfont.h', 'ImUtil.h', 'Xcms.h', 'XKBlib.h', 'XlibConf.h', 'Xlib.h', 'Xlibint.h', 'Xlib-xcb.h',
-            'Xlocale.h', 'Xregion.h', 'Xresource.h', 'Xutil.h',
-        ]
+        'cursorfont.h', 'ImUtil.h', 'Xcms.h', 'XKBlib.h', 'XlibConf.h', 'Xlib.h', 'Xlibint.h', 'Xlib-xcb.h',
+        'Xlocale.h', 'Xregion.h', 'Xresource.h', 'Xutil.h',
+    ]
     ],
     'dirs': [],
 }
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 6dc47a39efcba5f2164e20308025769c5d667fa8..09325945908fc8623b0da6cd47d55e4dceaf8b31 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
@@ -27,9 +27,9 @@ dependencies = [
 
 sanity_check_paths = {
     'files': ['include/X11/%s' % x for x in [
-            'cursorfont.h', 'ImUtil.h', 'Xcms.h', 'XKBlib.h', 'XlibConf.h', 'Xlib.h', 'Xlibint.h', 'Xlib-xcb.h',
-            'Xlocale.h', 'Xregion.h', 'Xresource.h', 'Xutil.h',
-        ]
+        'cursorfont.h', 'ImUtil.h', 'Xcms.h', 'XKBlib.h', 'XlibConf.h', 'Xlib.h', 'Xlibint.h', 'Xlib-xcb.h',
+        'Xlocale.h', 'Xregion.h', 'Xresource.h', 'Xutil.h',
+    ]
     ],
     'dirs': [],
 }
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 ee582416a0923c4255dcddd6698d86e9990ae213..ef095b7705be01bc762b280f8357bc04c931e2ea 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
@@ -27,9 +27,9 @@ dependencies = [
 
 sanity_check_paths = {
     'files': ['include/X11/%s' % x for x in [
-            'cursorfont.h', 'ImUtil.h', 'Xcms.h', 'XKBlib.h', 'XlibConf.h', 'Xlib.h', 'Xlibint.h', 'Xlib-xcb.h',
-            'Xlocale.h', 'Xregion.h', 'Xresource.h', 'Xutil.h',
-        ]
+        'cursorfont.h', 'ImUtil.h', 'Xcms.h', 'XKBlib.h', 'XlibConf.h', 'Xlib.h', 'Xlibint.h', 'Xlib-xcb.h',
+        'Xlocale.h', 'Xregion.h', 'Xresource.h', 'Xutil.h',
+    ]
     ],
     'dirs': [],
 }
diff --git a/easybuild/easyconfigs/l/libX11/libX11-1.6.3-goolf-1.5.14-Python-2.7.9.eb b/easybuild/easyconfigs/l/libX11/libX11-1.6.3-goolf-1.5.14-Python-2.7.9.eb
index 7e6d887343b3f7e54d5d735cfca461b98e232b76..9826dc599df3c0f2b3a27e07edc8d630fe633239 100644
--- a/easybuild/easyconfigs/l/libX11/libX11-1.6.3-goolf-1.5.14-Python-2.7.9.eb
+++ b/easybuild/easyconfigs/l/libX11/libX11-1.6.3-goolf-1.5.14-Python-2.7.9.eb
@@ -27,9 +27,9 @@ dependencies = [
 
 sanity_check_paths = {
     'files': ['include/X11/%s' % x for x in [
-            'cursorfont.h', 'ImUtil.h', 'Xcms.h', 'XKBlib.h', 'XlibConf.h', 'Xlib.h', 'Xlibint.h', 'Xlib-xcb.h',
-            'Xlocale.h', 'Xregion.h', 'Xresource.h', 'Xutil.h',
-        ]
+        'cursorfont.h', 'ImUtil.h', 'Xcms.h', 'XKBlib.h', 'XlibConf.h', 'Xlib.h', 'Xlibint.h', 'Xlib-xcb.h',
+        'Xlocale.h', 'Xregion.h', 'Xresource.h', 'Xutil.h',
+    ]
     ],
     'dirs': [],
 }
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 a4a74373002a527d1689b22633a360ecbe4bbfb2..f3cc16617c92074bd184ded48da2f8705de6185f 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
@@ -27,9 +27,9 @@ dependencies = [
 
 sanity_check_paths = {
     'files': ['include/X11/%s' % x for x in [
-            'cursorfont.h', 'ImUtil.h', 'Xcms.h', 'XKBlib.h', 'XlibConf.h', 'Xlib.h', 'Xlibint.h', 'Xlib-xcb.h',
-            'Xlocale.h', 'Xregion.h', 'Xresource.h', 'Xutil.h',
-        ]
+        'cursorfont.h', 'ImUtil.h', 'Xcms.h', 'XKBlib.h', 'XlibConf.h', 'Xlib.h', 'Xlibint.h', 'Xlib-xcb.h',
+        'Xlocale.h', 'Xregion.h', 'Xresource.h', 'Xutil.h',
+    ]
     ],
     'dirs': [],
 }
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 fa0d2300e626c886d1f2f4d3741c8ab19d635c1a..f4b3c5923c6a57fd226f6d6909b92a6b821ef1bb 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
@@ -27,9 +27,9 @@ dependencies = [
 
 sanity_check_paths = {
     'files': ['include/X11/%s' % x for x in [
-            'cursorfont.h', 'ImUtil.h', 'Xcms.h', 'XKBlib.h', 'XlibConf.h', 'Xlib.h', 'Xlibint.h', 'Xlib-xcb.h',
-            'Xlocale.h', 'Xregion.h', 'Xresource.h', 'Xutil.h',
-        ]
+        'cursorfont.h', 'ImUtil.h', 'Xcms.h', 'XKBlib.h', 'XlibConf.h', 'Xlib.h', 'Xlibint.h', 'Xlib-xcb.h',
+        'Xlocale.h', 'Xregion.h', 'Xresource.h', 'Xutil.h',
+    ]
     ],
     'dirs': [],
 }
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 90a1e61002a4da340131a706295f84e5a3fdadb1..57e06f392acb24d96db6a25abdda8af16ffee58e 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
@@ -27,9 +27,9 @@ dependencies = [
 
 sanity_check_paths = {
     'files': ['include/X11/%s' % x for x in [
-            'cursorfont.h', 'ImUtil.h', 'Xcms.h', 'XKBlib.h', 'XlibConf.h', 'Xlib.h', 'Xlibint.h', 'Xlib-xcb.h',
-            'Xlocale.h', 'Xregion.h', 'Xresource.h', 'Xutil.h',
-        ]
+        'cursorfont.h', 'ImUtil.h', 'Xcms.h', 'XKBlib.h', 'XlibConf.h', 'Xlib.h', 'Xlibint.h', 'Xlib-xcb.h',
+        'Xlocale.h', 'Xregion.h', 'Xresource.h', 'Xutil.h',
+    ]
     ],
     'dirs': [],
 }
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 ce11a9ade319ba602a18c19900f3aa9e537b99a8..3280e3a1e6468d205b2e814b927c5360ef20b5d8 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
@@ -27,9 +27,9 @@ dependencies = [
 
 sanity_check_paths = {
     'files': ['include/X11/%s' % x for x in [
-            'cursorfont.h', 'ImUtil.h', 'Xcms.h', 'XKBlib.h', 'XlibConf.h', 'Xlib.h', 'Xlibint.h', 'Xlib-xcb.h',
-            'Xlocale.h', 'Xregion.h', 'Xresource.h', 'Xutil.h',
-        ]
+        'cursorfont.h', 'ImUtil.h', 'Xcms.h', 'XKBlib.h', 'XlibConf.h', 'Xlib.h', 'Xlibint.h', 'Xlib-xcb.h',
+        'Xlocale.h', 'Xregion.h', 'Xresource.h', 'Xutil.h',
+    ]
     ],
     'dirs': [],
 }
diff --git a/easybuild/easyconfigs/l/libXext/libXext-1.3.2-foss-2014b-Python-2.7.8.eb b/easybuild/easyconfigs/l/libXext/libXext-1.3.2-foss-2014b-Python-2.7.8.eb
index 2ed55c95cd52ea153b6e654a2a77d48739448f26..4ef33fe4796e32a8f15e6abddcca6f158b7d592a 100644
--- a/easybuild/easyconfigs/l/libXext/libXext-1.3.2-foss-2014b-Python-2.7.8.eb
+++ b/easybuild/easyconfigs/l/libXext/libXext-1.3.2-foss-2014b-Python-2.7.8.eb
@@ -17,16 +17,16 @@ builddependencies = [
     ('kbproto', '1.0.6'),
 ]
 dependencies = [
-    ('xproto','7.0.26'),
+    ('xproto', '7.0.26'),
     ('libX11', '1.6.2', versionsuffix),
     ('xextproto', '7.3.0'),
 ]
 
 sanity_check_paths = {
     'files': ['include/X11/extensions/%s' % x for x in [
-            'dpms.h', 'extutil.h', 'MITMisc.h', 'multibuf.h', 'security.h', 'shape.h', 'sync.h', 'Xag.h', 'Xcup.h',
-            'Xdbe.h', 'XEVI.h', 'Xext.h', 'Xge.h', 'XLbx.h', 'XShm.h', 'xtestext1.h',
-        ]
+        'dpms.h', 'extutil.h', 'MITMisc.h', 'multibuf.h', 'security.h', 'shape.h', 'sync.h', 'Xag.h', 'Xcup.h',
+        'Xdbe.h', 'XEVI.h', 'Xext.h', 'Xge.h', 'XLbx.h', 'XShm.h', 'xtestext1.h',
+    ]
     ],
     'dirs': [],
 }
diff --git a/easybuild/easyconfigs/l/libXext/libXext-1.3.2-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libXext/libXext-1.3.2-goolf-1.4.10.eb
index 4a8d61c2665b6d1c722e76524f00832847d27dd3..2584eff6b6155b4e72af31dae625f1654fec9eb1 100644
--- a/easybuild/easyconfigs/l/libXext/libXext-1.3.2-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/l/libXext/libXext-1.3.2-goolf-1.4.10.eb
@@ -13,16 +13,16 @@ sources = [SOURCE_TAR_GZ]
 source_urls = [XORG_LIB_SOURCE]
 
 dependencies = [
-    ('xproto','7.0.23'),
+    ('xproto', '7.0.23'),
     ('libX11', '1.6.1'),
     ('xextproto', '7.2.1'),
 ]
 
 sanity_check_paths = {
     'files': ['include/X11/extensions/%s' % x for x in [
-            'dpms.h', 'extutil.h', 'MITMisc.h', 'multibuf.h', 'security.h', 'shape.h', 'sync.h', 'Xag.h', 'Xcup.h',
-            'Xdbe.h', 'XEVI.h', 'Xext.h', 'Xge.h', 'XLbx.h', 'XShm.h', 'xtestext1.h',
-        ]
+        'dpms.h', 'extutil.h', 'MITMisc.h', 'multibuf.h', 'security.h', 'shape.h', 'sync.h', 'Xag.h', 'Xcup.h',
+        'Xdbe.h', 'XEVI.h', 'Xext.h', 'Xge.h', 'XLbx.h', 'XShm.h', 'xtestext1.h',
+    ]
     ],
     'dirs': [],
 }
diff --git a/easybuild/easyconfigs/l/libXext/libXext-1.3.2-ictce-4.1.13.eb b/easybuild/easyconfigs/l/libXext/libXext-1.3.2-ictce-4.1.13.eb
index 638857be648ec6115e505f38a324b3ed9125e985..b016a23bf82b388746f9121731131ce5fa515c39 100644
--- a/easybuild/easyconfigs/l/libXext/libXext-1.3.2-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/l/libXext/libXext-1.3.2-ictce-4.1.13.eb
@@ -13,16 +13,16 @@ sources = [SOURCE_TAR_GZ]
 source_urls = [XORG_LIB_SOURCE]
 
 dependencies = [
-    ('xproto','7.0.23'),
+    ('xproto', '7.0.23'),
     ('libX11', '1.6.1'),
     ('xextproto', '7.2.1'),
 ]
 
 sanity_check_paths = {
     'files': ['include/X11/extensions/%s' % x for x in [
-            'dpms.h', 'extutil.h', 'MITMisc.h', 'multibuf.h', 'security.h', 'shape.h', 'sync.h', 'Xag.h', 'Xcup.h',
-            'Xdbe.h', 'XEVI.h', 'Xext.h', 'Xge.h', 'XLbx.h', 'XShm.h', 'xtestext1.h',
-        ]
+        'dpms.h', 'extutil.h', 'MITMisc.h', 'multibuf.h', 'security.h', 'shape.h', 'sync.h', 'Xag.h', 'Xcup.h',
+        'Xdbe.h', 'XEVI.h', 'Xext.h', 'Xge.h', 'XLbx.h', 'XShm.h', 'xtestext1.h',
+    ]
     ],
     'dirs': [],
 }
diff --git a/easybuild/easyconfigs/l/libXext/libXext-1.3.2-ictce-5.3.0.eb b/easybuild/easyconfigs/l/libXext/libXext-1.3.2-ictce-5.3.0.eb
index c45e32b915b9378754d5048c2ac24ea954b9cd57..e25402f03d5ad2628ddcc48f65f0e2c63ecc57b1 100644
--- a/easybuild/easyconfigs/l/libXext/libXext-1.3.2-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/l/libXext/libXext-1.3.2-ictce-5.3.0.eb
@@ -13,16 +13,16 @@ sources = [SOURCE_TAR_GZ]
 source_urls = [XORG_LIB_SOURCE]
 
 dependencies = [
-    ('xproto','7.0.23'),
+    ('xproto', '7.0.23'),
     ('libX11', '1.6.1'),
     ('xextproto', '7.2.1'),
 ]
 
 sanity_check_paths = {
     'files': ['include/X11/extensions/%s' % x for x in [
-            'dpms.h', 'extutil.h', 'MITMisc.h', 'multibuf.h', 'security.h', 'shape.h', 'sync.h', 'Xag.h', 'Xcup.h',
-            'Xdbe.h', 'XEVI.h', 'Xext.h', 'Xge.h', 'XLbx.h', 'XShm.h', 'xtestext1.h',
-        ]
+        'dpms.h', 'extutil.h', 'MITMisc.h', 'multibuf.h', 'security.h', 'shape.h', 'sync.h', 'Xag.h', 'Xcup.h',
+        'Xdbe.h', 'XEVI.h', 'Xext.h', 'Xge.h', 'XLbx.h', 'XShm.h', 'xtestext1.h',
+    ]
     ],
     'dirs': [],
 }
diff --git a/easybuild/easyconfigs/l/libXext/libXext-1.3.2-intel-2014b-Python-2.7.8.eb b/easybuild/easyconfigs/l/libXext/libXext-1.3.2-intel-2014b-Python-2.7.8.eb
index 4dd886a4bf04af97f8d91858786c645be62d5b0a..70f0ca40eab609f67e764c1edd28f64c66836e10 100644
--- a/easybuild/easyconfigs/l/libXext/libXext-1.3.2-intel-2014b-Python-2.7.8.eb
+++ b/easybuild/easyconfigs/l/libXext/libXext-1.3.2-intel-2014b-Python-2.7.8.eb
@@ -15,7 +15,7 @@ source_urls = [XORG_LIB_SOURCE]
 versionsuffix = '-Python-2.7.8'
 builddependencies = [
     ('kbproto', '1.0.6'),
-    ('xproto','7.0.26'),
+    ('xproto', '7.0.26'),
     ('xextproto', '7.3.0'),
 ]
 dependencies = [
@@ -24,9 +24,9 @@ dependencies = [
 
 sanity_check_paths = {
     'files': ['include/X11/extensions/%s' % x for x in [
-            'dpms.h', 'extutil.h', 'MITMisc.h', 'multibuf.h', 'security.h', 'shape.h', 'sync.h', 'Xag.h', 'Xcup.h',
-            'Xdbe.h', 'XEVI.h', 'Xext.h', 'Xge.h', 'XLbx.h', 'XShm.h', 'xtestext1.h',
-        ]
+        'dpms.h', 'extutil.h', 'MITMisc.h', 'multibuf.h', 'security.h', 'shape.h', 'sync.h', 'Xag.h', 'Xcup.h',
+        'Xdbe.h', 'XEVI.h', 'Xext.h', 'Xge.h', 'XLbx.h', 'XShm.h', 'xtestext1.h',
+    ]
     ],
     'dirs': [],
 }
diff --git a/easybuild/easyconfigs/l/libXext/libXext-1.3.2-intel-2014b.eb b/easybuild/easyconfigs/l/libXext/libXext-1.3.2-intel-2014b.eb
index 8ff72de9ba57e171f53f1ed993c948f5f0bba37c..1eeae06c66d2b5b79961527fc7b1668ffcd3b04a 100644
--- a/easybuild/easyconfigs/l/libXext/libXext-1.3.2-intel-2014b.eb
+++ b/easybuild/easyconfigs/l/libXext/libXext-1.3.2-intel-2014b.eb
@@ -18,15 +18,15 @@ dependencies = [
 ]
 
 builddependencies = [
-    ('xproto','7.0.26'),
+    ('xproto', '7.0.26'),
     ('xextproto', '7.2.1'),
 ]
 
 sanity_check_paths = {
     'files': ['include/X11/extensions/%s' % x for x in [
-            'dpms.h', 'extutil.h', 'MITMisc.h', 'multibuf.h', 'security.h', 'shape.h', 'sync.h', 'Xag.h', 'Xcup.h',
-            'Xdbe.h', 'XEVI.h', 'Xext.h', 'Xge.h', 'XLbx.h', 'XShm.h', 'xtestext1.h',
-        ]
+        'dpms.h', 'extutil.h', 'MITMisc.h', 'multibuf.h', 'security.h', 'shape.h', 'sync.h', 'Xag.h', 'Xcup.h',
+        'Xdbe.h', 'XEVI.h', 'Xext.h', 'Xge.h', 'XLbx.h', 'XShm.h', 'xtestext1.h',
+    ]
     ],
     'dirs': [],
 }
diff --git a/easybuild/easyconfigs/l/libXext/libXext-1.3.3-goolf-1.5.14.eb b/easybuild/easyconfigs/l/libXext/libXext-1.3.3-goolf-1.5.14.eb
index 63124eca9a2591adea655b2cfe0369868a432725..f5d31320ddbee49261ed4016dcf4f41c24f5c000 100644
--- a/easybuild/easyconfigs/l/libXext/libXext-1.3.3-goolf-1.5.14.eb
+++ b/easybuild/easyconfigs/l/libXext/libXext-1.3.3-goolf-1.5.14.eb
@@ -24,9 +24,9 @@ dependencies = [
 
 sanity_check_paths = {
     'files': ['include/X11/extensions/%s' % x for x in [
-            'dpms.h', 'extutil.h', 'MITMisc.h', 'multibuf.h', 'security.h', 'shape.h', 'sync.h', 'Xag.h', 'Xcup.h',
-            'Xdbe.h', 'XEVI.h', 'Xext.h', 'Xge.h', 'XLbx.h', 'XShm.h', 'xtestext1.h',
-        ]
+        'dpms.h', 'extutil.h', 'MITMisc.h', 'multibuf.h', 'security.h', 'shape.h', 'sync.h', 'Xag.h', 'Xcup.h',
+        'Xdbe.h', 'XEVI.h', 'Xext.h', 'Xge.h', 'XLbx.h', 'XShm.h', 'xtestext1.h',
+    ]
     ],
     'dirs': [],
 }
diff --git a/easybuild/easyconfigs/l/libXext/libXext-1.3.3-intel-2015a-Python-2.7.10.eb b/easybuild/easyconfigs/l/libXext/libXext-1.3.3-intel-2015a-Python-2.7.10.eb
index a959a12b0ade1d798c8452b1a08e98d1e73b845e..fea0b330b99710ce3e39220e175ae7aaf70974ac 100644
--- a/easybuild/easyconfigs/l/libXext/libXext-1.3.3-intel-2015a-Python-2.7.10.eb
+++ b/easybuild/easyconfigs/l/libXext/libXext-1.3.3-intel-2015a-Python-2.7.10.eb
@@ -25,9 +25,9 @@ dependencies = [
 
 sanity_check_paths = {
     'files': ['include/X11/extensions/%s' % x for x in [
-            'dpms.h', 'extutil.h', 'MITMisc.h', 'multibuf.h', 'security.h', 'shape.h', 'sync.h', 'Xag.h', 'Xcup.h',
-            'Xdbe.h', 'XEVI.h', 'Xext.h', 'Xge.h', 'XLbx.h', 'XShm.h', 'xtestext1.h',
-        ]
+        'dpms.h', 'extutil.h', 'MITMisc.h', 'multibuf.h', 'security.h', 'shape.h', 'sync.h', 'Xag.h', 'Xcup.h',
+        'Xdbe.h', 'XEVI.h', 'Xext.h', 'Xge.h', 'XLbx.h', 'XShm.h', 'xtestext1.h',
+    ]
     ],
     'dirs': [],
 }
diff --git a/easybuild/easyconfigs/l/libXext/libXext-1.3.3-intel-2015a.eb b/easybuild/easyconfigs/l/libXext/libXext-1.3.3-intel-2015a.eb
index 7499144fec3c55bd573806143ae5e2d69204efa7..c076690abe4da871c64288d82729c17c1924848b 100644
--- a/easybuild/easyconfigs/l/libXext/libXext-1.3.3-intel-2015a.eb
+++ b/easybuild/easyconfigs/l/libXext/libXext-1.3.3-intel-2015a.eb
@@ -24,9 +24,9 @@ dependencies = [
 
 sanity_check_paths = {
     'files': ['include/X11/extensions/%s' % x for x in [
-            'dpms.h', 'extutil.h', 'MITMisc.h', 'multibuf.h', 'security.h', 'shape.h', 'sync.h', 'Xag.h', 'Xcup.h',
-            'Xdbe.h', 'XEVI.h', 'Xext.h', 'Xge.h', 'XLbx.h', 'XShm.h', 'xtestext1.h',
-        ]
+        'dpms.h', 'extutil.h', 'MITMisc.h', 'multibuf.h', 'security.h', 'shape.h', 'sync.h', 'Xag.h', 'Xcup.h',
+        'Xdbe.h', 'XEVI.h', 'Xext.h', 'Xge.h', 'XLbx.h', 'XShm.h', 'xtestext1.h',
+    ]
     ],
     'dirs': [],
 }
diff --git a/easybuild/easyconfigs/l/libXext/libXext-1.3.3-intel-2015b-Python-2.7.11.eb b/easybuild/easyconfigs/l/libXext/libXext-1.3.3-intel-2015b-Python-2.7.11.eb
index d0916f41c9abce830141aafaf2cf970ad39df9ae..23544e2ee33727185a21dda798561a31e8754b36 100644
--- a/easybuild/easyconfigs/l/libXext/libXext-1.3.3-intel-2015b-Python-2.7.11.eb
+++ b/easybuild/easyconfigs/l/libXext/libXext-1.3.3-intel-2015b-Python-2.7.11.eb
@@ -25,9 +25,9 @@ dependencies = [
 
 sanity_check_paths = {
     'files': ['include/X11/extensions/%s' % x for x in [
-            'dpms.h', 'extutil.h', 'MITMisc.h', 'multibuf.h', 'security.h', 'shape.h', 'sync.h', 'Xag.h', 'Xcup.h',
-            'Xdbe.h', 'XEVI.h', 'Xext.h', 'Xge.h', 'XLbx.h', 'XShm.h', 'xtestext1.h',
-        ]
+        'dpms.h', 'extutil.h', 'MITMisc.h', 'multibuf.h', 'security.h', 'shape.h', 'sync.h', 'Xag.h', 'Xcup.h',
+        'Xdbe.h', 'XEVI.h', 'Xext.h', 'Xge.h', 'XLbx.h', 'XShm.h', 'xtestext1.h',
+    ]
     ],
     'dirs': [],
 }
diff --git a/easybuild/easyconfigs/l/libXext/libXext-1.3.3-intel-2015b.eb b/easybuild/easyconfigs/l/libXext/libXext-1.3.3-intel-2015b.eb
index 3b75bb1efad209ff6ae2acb2d9993c248ed11e51..93ffb79a95543fc3edab3697f6d404b61a979720 100644
--- a/easybuild/easyconfigs/l/libXext/libXext-1.3.3-intel-2015b.eb
+++ b/easybuild/easyconfigs/l/libXext/libXext-1.3.3-intel-2015b.eb
@@ -24,9 +24,9 @@ dependencies = [
 
 sanity_check_paths = {
     'files': ['include/X11/extensions/%s' % x for x in [
-            'dpms.h', 'extutil.h', 'MITMisc.h', 'multibuf.h', 'security.h', 'shape.h', 'sync.h', 'Xag.h', 'Xcup.h',
-            'Xdbe.h', 'XEVI.h', 'Xext.h', 'Xge.h', 'XLbx.h', 'XShm.h', 'xtestext1.h',
-        ]
+        'dpms.h', 'extutil.h', 'MITMisc.h', 'multibuf.h', 'security.h', 'shape.h', 'sync.h', 'Xag.h', 'Xcup.h',
+        'Xdbe.h', 'XEVI.h', 'Xext.h', 'Xge.h', 'XLbx.h', 'XShm.h', 'xtestext1.h',
+    ]
     ],
     'dirs': [],
 }
diff --git a/easybuild/easyconfigs/l/libXfixes/libXfixes-5.0.1-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libXfixes/libXfixes-5.0.1-goolf-1.4.10.eb
index 501a07d2d9d9671f8d32c28cae8bc580bbdf057f..aa1121d88143051fc2b3caf2e89ac7e376279902 100644
--- a/easybuild/easyconfigs/l/libXfixes/libXfixes-5.0.1-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/l/libXfixes/libXfixes-5.0.1-goolf-1.4.10.eb
@@ -17,8 +17,8 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files' : ['include/X11/extensions/Xfixes.h', 'lib/libXfixes.a', 'lib/libXfixes.%s' % SHLIB_EXT],
-    'dirs' : [],
+    'files': ['include/X11/extensions/Xfixes.h', 'lib/libXfixes.a', 'lib/libXfixes.%s' % SHLIB_EXT],
+    'dirs': [],
 }
 
 moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/l/libXfixes/libXfixes-5.0.1-ictce-4.1.13.eb b/easybuild/easyconfigs/l/libXfixes/libXfixes-5.0.1-ictce-4.1.13.eb
index b97a4a27936bfeead8ec9962bace704c8f3c8538..67b2754c020a45257cce8444bbb0fd847af17d49 100644
--- a/easybuild/easyconfigs/l/libXfixes/libXfixes-5.0.1-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/l/libXfixes/libXfixes-5.0.1-ictce-4.1.13.eb
@@ -17,8 +17,8 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files' : ['include/X11/extensions/Xfixes.h', 'lib/libXfixes.a', 'lib/libXfixes.%s' % SHLIB_EXT],
-    'dirs' : [],
+    'files': ['include/X11/extensions/Xfixes.h', 'lib/libXfixes.a', 'lib/libXfixes.%s' % SHLIB_EXT],
+    'dirs': [],
 }
 
 moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/l/libXfixes/libXfixes-5.0.1-ictce-5.3.0.eb b/easybuild/easyconfigs/l/libXfixes/libXfixes-5.0.1-ictce-5.3.0.eb
index a90ec28a7d027cfdee85b904ecdaf581b660c497..e22050059eaf8daf45732dafd09ac20cc6fe081e 100644
--- a/easybuild/easyconfigs/l/libXfixes/libXfixes-5.0.1-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/l/libXfixes/libXfixes-5.0.1-ictce-5.3.0.eb
@@ -17,8 +17,8 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files' : ['include/X11/extensions/Xfixes.h', 'lib/libXfixes.a', 'lib/libXfixes.%s' % SHLIB_EXT],
-    'dirs' : [],
+    'files': ['include/X11/extensions/Xfixes.h', 'lib/libXfixes.a', 'lib/libXfixes.%s' % SHLIB_EXT],
+    'dirs': [],
 }
 
 moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/l/libXfixes/libXfixes-5.0.1-intel-2015a.eb b/easybuild/easyconfigs/l/libXfixes/libXfixes-5.0.1-intel-2015a.eb
index 51127a819452e3f8cca89e9f837ebd92e942f5bb..fd77718af896d91da7e63ed593149bd7ef7e74a5 100644
--- a/easybuild/easyconfigs/l/libXfixes/libXfixes-5.0.1-intel-2015a.eb
+++ b/easybuild/easyconfigs/l/libXfixes/libXfixes-5.0.1-intel-2015a.eb
@@ -17,8 +17,8 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files' : ['include/X11/extensions/Xfixes.h', 'lib/libXfixes.a', 'lib/libXfixes.%s' % SHLIB_EXT],
-    'dirs' : [],
+    'files': ['include/X11/extensions/Xfixes.h', 'lib/libXfixes.a', 'lib/libXfixes.%s' % SHLIB_EXT],
+    'dirs': [],
 }
 
 moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/l/libXfixes/libXfixes-5.0.1-intel-2015b.eb b/easybuild/easyconfigs/l/libXfixes/libXfixes-5.0.1-intel-2015b.eb
index 84e087e7bc4f52f0269f85ac0e59b85b6eb4f9c6..35d7f6f2848a57080aa914f0ea7fd457e4c72bf2 100644
--- a/easybuild/easyconfigs/l/libXfixes/libXfixes-5.0.1-intel-2015b.eb
+++ b/easybuild/easyconfigs/l/libXfixes/libXfixes-5.0.1-intel-2015b.eb
@@ -17,8 +17,8 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files' : ['include/X11/extensions/Xfixes.h', 'lib/libXfixes.a', 'lib/libXfixes.%s' % SHLIB_EXT],
-    'dirs' : [],
+    'files': ['include/X11/extensions/Xfixes.h', 'lib/libXfixes.a', 'lib/libXfixes.%s' % SHLIB_EXT],
+    'dirs': [],
 }
 
 moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/l/libXi/libXi-1.7.2-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libXi/libXi-1.7.2-goolf-1.4.10.eb
index 5f423967c0c59cbb3c9f43ef9b0264ac12e33d12..8b0e336093596de3b852b87c8fc84d6244ebe118 100644
--- a/easybuild/easyconfigs/l/libXi/libXi-1.7.2-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/l/libXi/libXi-1.7.2-goolf-1.4.10.eb
@@ -20,8 +20,8 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files' : ['include/X11/extensions/XInput.h', 'include/X11/extensions/XInput2.h', 'lib/libXi.%s' % SHLIB_EXT, 'lib/libXi.a'],
-    'dirs' : [],
+    'files': ['include/X11/extensions/XInput.h', 'include/X11/extensions/XInput2.h', 'lib/libXi.%s' % SHLIB_EXT, 'lib/libXi.a'],
+    'dirs': [],
 }
 
 moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/l/libXi/libXi-1.7.2-ictce-4.1.13.eb b/easybuild/easyconfigs/l/libXi/libXi-1.7.2-ictce-4.1.13.eb
index 4b0cae6a95ff3cd23482c189b3cbd8923003066a..dc21c6f8e90969ae7206b2fbcc6182238dffd577 100644
--- a/easybuild/easyconfigs/l/libXi/libXi-1.7.2-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/l/libXi/libXi-1.7.2-ictce-4.1.13.eb
@@ -20,8 +20,8 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files' : ['include/X11/extensions/XInput.h', 'include/X11/extensions/XInput2.h', 'lib/libXi.%s' % SHLIB_EXT, 'lib/libXi.a'],
-    'dirs' : [],
+    'files': ['include/X11/extensions/XInput.h', 'include/X11/extensions/XInput2.h', 'lib/libXi.%s' % SHLIB_EXT, 'lib/libXi.a'],
+    'dirs': [],
 }
 
 moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/l/libXi/libXi-1.7.2-ictce-5.3.0.eb b/easybuild/easyconfigs/l/libXi/libXi-1.7.2-ictce-5.3.0.eb
index ebca121b1074507794aa490d7a761bbb490f7892..0f718686632e59a349ead0592226301dae3d44e0 100644
--- a/easybuild/easyconfigs/l/libXi/libXi-1.7.2-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/l/libXi/libXi-1.7.2-ictce-5.3.0.eb
@@ -20,8 +20,8 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files' : ['include/X11/extensions/XInput.h', 'include/X11/extensions/XInput2.h', 'lib/libXi.%s' % SHLIB_EXT, 'lib/libXi.a'],
-    'dirs' : [],
+    'files': ['include/X11/extensions/XInput.h', 'include/X11/extensions/XInput2.h', 'lib/libXi.%s' % SHLIB_EXT, 'lib/libXi.a'],
+    'dirs': [],
 }
 
 moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/l/libXi/libXi-1.7.4-intel-2015a.eb b/easybuild/easyconfigs/l/libXi/libXi-1.7.4-intel-2015a.eb
index 0ed8458cff33bf823e61596be81bf56293196550..6943d3e084c3390e2243d96887d7cf344f1a29c5 100644
--- a/easybuild/easyconfigs/l/libXi/libXi-1.7.4-intel-2015a.eb
+++ b/easybuild/easyconfigs/l/libXi/libXi-1.7.4-intel-2015a.eb
@@ -19,8 +19,8 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files' : ['include/X11/extensions/XInput.h', 'include/X11/extensions/XInput2.h', 'lib/libXi.%s' % SHLIB_EXT, 'lib/libXi.a'],
-    'dirs' : [],
+    'files': ['include/X11/extensions/XInput.h', 'include/X11/extensions/XInput2.h', 'lib/libXi.%s' % SHLIB_EXT, 'lib/libXi.a'],
+    'dirs': [],
 }
 
 moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/l/libXi/libXi-1.7.4-intel-2015b-Python-2.7.11.eb b/easybuild/easyconfigs/l/libXi/libXi-1.7.4-intel-2015b-Python-2.7.11.eb
index 1eaec43d4ee7d6df3a8dc66accd451a2d62d4582..eaa232fe89b5623e244200c86516ddb54de93610 100644
--- a/easybuild/easyconfigs/l/libXi/libXi-1.7.4-intel-2015b-Python-2.7.11.eb
+++ b/easybuild/easyconfigs/l/libXi/libXi-1.7.4-intel-2015b-Python-2.7.11.eb
@@ -20,8 +20,8 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files' : ['include/X11/extensions/XInput.h', 'include/X11/extensions/XInput2.h', 'lib/libXi.so', 'lib/libXi.a'],
-    'dirs' : [],
+    'files': ['include/X11/extensions/XInput.h', 'include/X11/extensions/XInput2.h', 'lib/libXi.so', 'lib/libXi.a'],
+    'dirs': [],
 }
 
 moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/l/libXi/libXi-1.7.4-intel-2015b.eb b/easybuild/easyconfigs/l/libXi/libXi-1.7.4-intel-2015b.eb
index 418bfdfe23480c01e3b87afebddfb5850a7d3945..0ed8e42a2078618241a5c260eead5a7814d8ef01 100644
--- a/easybuild/easyconfigs/l/libXi/libXi-1.7.4-intel-2015b.eb
+++ b/easybuild/easyconfigs/l/libXi/libXi-1.7.4-intel-2015b.eb
@@ -19,8 +19,8 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files' : ['include/X11/extensions/XInput.h', 'include/X11/extensions/XInput2.h', 'lib/libXi.%s' % SHLIB_EXT, 'lib/libXi.a'],
-    'dirs' : [],
+    'files': ['include/X11/extensions/XInput.h', 'include/X11/extensions/XInput2.h', 'lib/libXi.%s' % SHLIB_EXT, 'lib/libXi.a'],
+    'dirs': [],
 }
 
 moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/l/libXinerama/libXinerama-1.1.3-foss-2014b.eb b/easybuild/easyconfigs/l/libXinerama/libXinerama-1.1.3-foss-2014b.eb
index aa81cc7f3c341ba863ba8eabc61e8ca6c141526b..0364d9613fce81cd6baec874ce5baf706d843d61 100644
--- a/easybuild/easyconfigs/l/libXinerama/libXinerama-1.1.3-foss-2014b.eb
+++ b/easybuild/easyconfigs/l/libXinerama/libXinerama-1.1.3-foss-2014b.eb
@@ -18,8 +18,8 @@ builddependencies = [
     ('xextproto', '7.3.0'),
 ]
 dependencies = [
-    ('xproto','7.0.26'),
-    ('libX11', '1.6.2', pythonversion ),
+    ('xproto', '7.0.26'),
+    ('libX11', '1.6.2', pythonversion),
     ('libXext', '1.3.2', pythonversion),
 ]
 
diff --git a/easybuild/easyconfigs/l/libXinerama/libXinerama-1.1.3-intel-2014b.eb b/easybuild/easyconfigs/l/libXinerama/libXinerama-1.1.3-intel-2014b.eb
index bb8afc5c0c5e41db225db4a04039fcf3f80f5f79..5df23592a5d362b4fe237d351cb3eb84bde7ff59 100644
--- a/easybuild/easyconfigs/l/libXinerama/libXinerama-1.1.3-intel-2014b.eb
+++ b/easybuild/easyconfigs/l/libXinerama/libXinerama-1.1.3-intel-2014b.eb
@@ -18,8 +18,8 @@ builddependencies = [
     ('xextproto', '7.3.0'),
 ]
 dependencies = [
-    ('xproto','7.0.26'),
-    ('libX11', '1.6.2', pythonversion ),
+    ('xproto', '7.0.26'),
+    ('libX11', '1.6.2', pythonversion),
     ('libXext', '1.3.2', pythonversion),
 ]
 
diff --git a/easybuild/easyconfigs/l/libXinerama/libXinerama-1.1.3-intel-2015b-Python-2.7.11.eb b/easybuild/easyconfigs/l/libXinerama/libXinerama-1.1.3-intel-2015b-Python-2.7.11.eb
index df35769e55a9298850ff448764d56636f6e1c9e6..0dc7137ea0068d09e7c64364bfbbc9f7150597d7 100644
--- a/easybuild/easyconfigs/l/libXinerama/libXinerama-1.1.3-intel-2015b-Python-2.7.11.eb
+++ b/easybuild/easyconfigs/l/libXinerama/libXinerama-1.1.3-intel-2015b-Python-2.7.11.eb
@@ -19,7 +19,7 @@ builddependencies = [
 ]
 
 dependencies = [
-    ('xproto','7.0.28'),
+    ('xproto', '7.0.28'),
     ('libX11', '1.6.3', versionsuffix),
     ('libXext', '1.3.3', versionsuffix),
 ]
diff --git a/easybuild/easyconfigs/l/libXinerama/libXinerama-1.1.3-intel-2015b.eb b/easybuild/easyconfigs/l/libXinerama/libXinerama-1.1.3-intel-2015b.eb
index c836ab425a772d1dba0c93194cd4463d7b000ca3..0325a41bd381900a2aa838987168332c1fa25d70 100644
--- a/easybuild/easyconfigs/l/libXinerama/libXinerama-1.1.3-intel-2015b.eb
+++ b/easybuild/easyconfigs/l/libXinerama/libXinerama-1.1.3-intel-2015b.eb
@@ -18,7 +18,7 @@ builddependencies = [
 ]
 
 dependencies = [
-    ('xproto','7.0.28'),
+    ('xproto', '7.0.28'),
     ('libX11', '1.6.3', '-Python-2.7.10'),
     ('libXext', '1.3.3'),
 ]
diff --git a/easybuild/easyconfigs/l/libXmu/libXmu-1.1.2-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libXmu/libXmu-1.1.2-goolf-1.4.10.eb
index 8db3290cf386fb1b6b66d4f76590bf14db251719..2aab0fa578ed82bc9f88c6df81014f8d92098f00 100644
--- a/easybuild/easyconfigs/l/libXmu/libXmu-1.1.2-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/l/libXmu/libXmu-1.1.2-goolf-1.4.10.eb
@@ -18,11 +18,8 @@ dependencies = [
     ('libXt', '1.1.4'),
 ]
 sanity_check_paths = {
-    'files': ['lib/%s' % x for x in [
-            '%(name)s.a', '%(name)s.so',
-        ]
-    ],
-    'dirs': []
+    'files': ['lib/%s' % x for x in ['%(name)s.a', '%%(name)s.%s' % SHLIB_EXT]],
+    'dirs': [],
 }
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/l/libXmu/libXmu-1.1.2-goolf-1.5.14.eb b/easybuild/easyconfigs/l/libXmu/libXmu-1.1.2-goolf-1.5.14.eb
index 2c502db1e90f938684d142a1d7d70ab0516a2339..f13c6ad715ca2d2e7ab1993fe5e4c0cf6cd2532d 100644
--- a/easybuild/easyconfigs/l/libXmu/libXmu-1.1.2-goolf-1.5.14.eb
+++ b/easybuild/easyconfigs/l/libXmu/libXmu-1.1.2-goolf-1.5.14.eb
@@ -18,11 +18,8 @@ dependencies = [
     ('libXt', '1.1.4'),
 ]
 sanity_check_paths = {
-    'files': ['lib/%s' % x for x in [
-            '%(name)s.a', '%(name)s.so',
-        ]
-    ],
-    'dirs': []
+    'files': ['lib/%s' % x for x in ['%(name)s.a', '%%(name)s.%s' % SHLIB_EXT]],
+    'dirs': [],
 }
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/l/libXmu/libXmu-1.1.2-ictce-4.1.13.eb b/easybuild/easyconfigs/l/libXmu/libXmu-1.1.2-ictce-4.1.13.eb
index 5ab7c61a441e5916f149617e91ee7d348ed850fa..3bb4dae2016fcbe96ad56d8a7d49f1201d989e56 100644
--- a/easybuild/easyconfigs/l/libXmu/libXmu-1.1.2-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/l/libXmu/libXmu-1.1.2-ictce-4.1.13.eb
@@ -18,7 +18,7 @@ dependencies = [
     ('libXpm', '3.5.11'),
 ]
 sanity_check_paths = {
-    'files': ['lib/%s' % x for x in ['%(name)s.a', '%(name)s.so']],
+    'files': ['lib/%s' % x for x in ['%(name)s.a', '%%(name)s.%s' % SHLIB_EXT]],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/l/libXmu/libXmu-1.1.2-ictce-5.3.0.eb b/easybuild/easyconfigs/l/libXmu/libXmu-1.1.2-ictce-5.3.0.eb
index df5f4eeafacdd1fc621cef9b92f6120c80b6e926..2f2b809d1760208026e046cf52041e565dbebab0 100644
--- a/easybuild/easyconfigs/l/libXmu/libXmu-1.1.2-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/l/libXmu/libXmu-1.1.2-ictce-5.3.0.eb
@@ -18,7 +18,7 @@ dependencies = [
     ('libXpm', '3.5.11'),
 ]
 sanity_check_paths = {
-    'files': ['lib/%s' % x for x in ['%(name)s.a', '%(name)s.so']],
+    'files': ['lib/%s' % x for x in ['%(name)s.a', '%%(name)s.%s' % SHLIB_EXT]],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/l/libXmu/libXmu-1.1.2-intel-2015a-libX11-1.6.3.eb b/easybuild/easyconfigs/l/libXmu/libXmu-1.1.2-intel-2015a-libX11-1.6.3.eb
index 083f86b1a3805db508cf9038bf42d57e7d772ff9..de13f643a237f41f52b46e2eca47599c8426295a 100644
--- a/easybuild/easyconfigs/l/libXmu/libXmu-1.1.2-intel-2015a-libX11-1.6.3.eb
+++ b/easybuild/easyconfigs/l/libXmu/libXmu-1.1.2-intel-2015a-libX11-1.6.3.eb
@@ -19,7 +19,7 @@ dependencies = [
     ('libXpm', '3.5.11'),
 ]
 sanity_check_paths = {
-    'files': ['lib/%s' % x for x in ['%(name)s.a', '%(name)s.so']],
+    'files': ['lib/%s' % x for x in ['%(name)s.a', '%%(name)s.%s' % SHLIB_EXT]],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/l/libXp/libXp-1.0.2-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libXp/libXp-1.0.2-goolf-1.4.10.eb
index 7e4d47cef9d15e95bee80c4ca7251d88c4da5481..cd4cbda0f259428e6841d0c174d913959dd9f07a 100644
--- a/easybuild/easyconfigs/l/libXp/libXp-1.0.2-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/l/libXp/libXp-1.0.2-goolf-1.4.10.eb
@@ -13,14 +13,14 @@ sources = [SOURCE_TAR_GZ]
 source_urls = [XORG_LIB_SOURCE]
 
 builddependencies = [
-     ('xextproto', '7.2.1'),
-     ('printproto', '1.0.5'),
+    ('xextproto', '7.2.1'),
+    ('printproto', '1.0.5'),
 ]
 
 dependencies = [
-     ('libX11', '1.6.1'),
-     ('libXext', '1.3.2'),
-     ('libXau', '1.0.8'),
+    ('libX11', '1.6.1'),
+    ('libXext', '1.3.2'),
+    ('libXau', '1.0.8'),
 ]
 sanity_check_paths = {
     'files': ['lib/%s' % x for x in ['libXp.a', 'libXp.%s' % SHLIB_EXT]],
diff --git a/easybuild/easyconfigs/l/libXp/libXp-1.0.2-ictce-4.1.13.eb b/easybuild/easyconfigs/l/libXp/libXp-1.0.2-ictce-4.1.13.eb
index f3cb59abe1121ea71afbcb4db04da692690b6076..fcb4c60df7a4d92e4608134529e2ff031a00e824 100644
--- a/easybuild/easyconfigs/l/libXp/libXp-1.0.2-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/l/libXp/libXp-1.0.2-ictce-4.1.13.eb
@@ -13,14 +13,14 @@ sources = [SOURCE_TAR_GZ]
 source_urls = [XORG_LIB_SOURCE]
 
 builddependencies = [
-     ('xextproto', '7.2.1'),
-     ('printproto', '1.0.5'),
+    ('xextproto', '7.2.1'),
+    ('printproto', '1.0.5'),
 ]
 
 dependencies = [
-     ('libX11', '1.6.1'),
-     ('libXext', '1.3.2'),
-     ('libXau', '1.0.8'),
+    ('libX11', '1.6.1'),
+    ('libXext', '1.3.2'),
+    ('libXau', '1.0.8'),
 ]
 sanity_check_paths = {
     'files': ['lib/%s' % x for x in ['libXp.a', 'libXp.%s' % SHLIB_EXT]],
diff --git a/easybuild/easyconfigs/l/libXp/libXp-1.0.2-ictce-5.3.0.eb b/easybuild/easyconfigs/l/libXp/libXp-1.0.2-ictce-5.3.0.eb
index 5a95f178eedfa080f9449bc2cf3a3fb3310f8743..88ac2990ec411219ea4cf59fc82633a307d6b14e 100644
--- a/easybuild/easyconfigs/l/libXp/libXp-1.0.2-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/l/libXp/libXp-1.0.2-ictce-5.3.0.eb
@@ -13,14 +13,14 @@ sources = [SOURCE_TAR_GZ]
 source_urls = [XORG_LIB_SOURCE]
 
 builddependencies = [
-     ('xextproto', '7.2.1'),
-     ('printproto', '1.0.5'),
+    ('xextproto', '7.2.1'),
+    ('printproto', '1.0.5'),
 ]
 
 dependencies = [
-     ('libX11', '1.6.1'),
-     ('libXext', '1.3.2'),
-     ('libXau', '1.0.8'),
+    ('libX11', '1.6.1'),
+    ('libXext', '1.3.2'),
+    ('libXau', '1.0.8'),
 ]
 sanity_check_paths = {
     'files': ['lib/%s' % x for x in ['libXp.a', 'libXp.%s' % SHLIB_EXT]],
diff --git a/easybuild/easyconfigs/l/libXp/libXp-1.0.3-goolf-1.5.14.eb b/easybuild/easyconfigs/l/libXp/libXp-1.0.3-goolf-1.5.14.eb
index 04dbfd170124d6befbddff4858675ad38e2bd66e..e680164e0bcbef4705f58e0ada17ee65d7232782 100644
--- a/easybuild/easyconfigs/l/libXp/libXp-1.0.3-goolf-1.5.14.eb
+++ b/easybuild/easyconfigs/l/libXp/libXp-1.0.3-goolf-1.5.14.eb
@@ -13,14 +13,14 @@ sources = [SOURCE_TAR_GZ]
 source_urls = [XORG_LIB_SOURCE]
 
 builddependencies = [
-     ('xextproto', '7.3.0'),
-     ('printproto', '1.0.5'),
+    ('xextproto', '7.3.0'),
+    ('printproto', '1.0.5'),
 ]
 
 dependencies = [
-     ('libX11', '1.6.3', '-Python-2.7.9'),
-     ('libXext', '1.3.3'),
-     ('libXau', '1.0.8'),
+    ('libX11', '1.6.3', '-Python-2.7.9'),
+    ('libXext', '1.3.3'),
+    ('libXau', '1.0.8'),
 ]
 sanity_check_paths = {
     'files': ['lib/%s' % x for x in ['libXp.a', 'libXp.%s' % SHLIB_EXT]],
diff --git a/easybuild/easyconfigs/l/libXp/libXp-1.0.3-intel-2015a.eb b/easybuild/easyconfigs/l/libXp/libXp-1.0.3-intel-2015a.eb
index c09d0e3c06fe967b1c9194c23ab3ccf428b110d0..da13ac755aa61f2defe8a5be0eec23f08fb293f9 100644
--- a/easybuild/easyconfigs/l/libXp/libXp-1.0.3-intel-2015a.eb
+++ b/easybuild/easyconfigs/l/libXp/libXp-1.0.3-intel-2015a.eb
@@ -13,14 +13,14 @@ sources = [SOURCE_TAR_GZ]
 source_urls = [XORG_LIB_SOURCE]
 
 builddependencies = [
-     ('xextproto', '7.3.0'),
-     ('printproto', '1.0.5'),
+    ('xextproto', '7.3.0'),
+    ('printproto', '1.0.5'),
 ]
 
 dependencies = [
-     ('libX11', '1.6.3', '-Python-2.7.9'),
-     ('libXext', '1.3.3'),
-     ('libXau', '1.0.8'),
+    ('libX11', '1.6.3', '-Python-2.7.9'),
+    ('libXext', '1.3.3'),
+    ('libXau', '1.0.8'),
 ]
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/l/libXt/libXt-1.1.4-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libXt/libXt-1.1.4-goolf-1.4.10.eb
index 0a3d6df938d58c146e2af5072712e1647ad97682..a620b54e1373b0166c5215b645027755c8d1d1e6 100644
--- a/easybuild/easyconfigs/l/libXt/libXt-1.1.4-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/l/libXt/libXt-1.1.4-goolf-1.4.10.eb
@@ -22,15 +22,15 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files' : ['include/X11/%s' % x for x in [
+    'files': ['include/X11/%s' % x for x in [
         'CallbackI.h', 'CompositeP.h', 'Constraint.h', 'Core.h', 'CreateI.h', 'HookObjI.h', 'Intrinsic.h',
         'IntrinsicP.h', 'ObjectP.h', 'RectObj.h', 'ResConfigP.h', 'SelectionI.h', 'ShellI.h', 'StringDefs.h',
         'TranslateI.h', 'Vendor.h', 'Xtos.h', 'Composite.h', 'ConstrainP.h', 'ConvertI.h', 'CoreP.h', 'EventI.h',
         'InitialI.h', 'IntrinsicI.h', 'Object.h', 'PassivGraI.h', 'RectObjP.h', 'ResourceI.h', 'Shell.h', 'ShellP.h',
         'ThreadsI.h', 'VarargsI.h', 'VendorP.h',
-        ]
+    ]
     ],
-    'dirs' : [],
+    'dirs': [],
 }
 
 moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/l/libXt/libXt-1.1.4-goolf-1.5.14.eb b/easybuild/easyconfigs/l/libXt/libXt-1.1.4-goolf-1.5.14.eb
index d22341b9fce55af2032261d8c2a6aadf70bd9535..a04d9667434eb9e4eb820360e75ccfbcfcf13245 100644
--- a/easybuild/easyconfigs/l/libXt/libXt-1.1.4-goolf-1.5.14.eb
+++ b/easybuild/easyconfigs/l/libXt/libXt-1.1.4-goolf-1.5.14.eb
@@ -22,15 +22,15 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files' : ['include/X11/%s' % x for x in [
+    'files': ['include/X11/%s' % x for x in [
         'CallbackI.h', 'CompositeP.h', 'Constraint.h', 'Core.h', 'CreateI.h', 'HookObjI.h', 'Intrinsic.h',
         'IntrinsicP.h', 'ObjectP.h', 'RectObj.h', 'ResConfigP.h', 'SelectionI.h', 'ShellI.h', 'StringDefs.h',
         'TranslateI.h', 'Vendor.h', 'Xtos.h', 'Composite.h', 'ConstrainP.h', 'ConvertI.h', 'CoreP.h', 'EventI.h',
         'InitialI.h', 'IntrinsicI.h', 'Object.h', 'PassivGraI.h', 'RectObjP.h', 'ResourceI.h', 'Shell.h', 'ShellP.h',
         'ThreadsI.h', 'VarargsI.h', 'VendorP.h',
-        ]
+    ]
     ],
-    'dirs' : [],
+    'dirs': [],
 }
 
 moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/l/libXt/libXt-1.1.4-ictce-4.1.13.eb b/easybuild/easyconfigs/l/libXt/libXt-1.1.4-ictce-4.1.13.eb
index 0419ecbed294a040af05fc75e833a8012a1e5e39..6224c7a3e21815aff26ed7fee3256f3eacee13d9 100644
--- a/easybuild/easyconfigs/l/libXt/libXt-1.1.4-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/l/libXt/libXt-1.1.4-ictce-4.1.13.eb
@@ -22,15 +22,15 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files' : ['include/X11/%s' % x for x in [
+    'files': ['include/X11/%s' % x for x in [
         'CallbackI.h', 'CompositeP.h', 'Constraint.h', 'Core.h', 'CreateI.h', 'HookObjI.h', 'Intrinsic.h',
         'IntrinsicP.h', 'ObjectP.h', 'RectObj.h', 'ResConfigP.h', 'SelectionI.h', 'ShellI.h', 'StringDefs.h',
         'TranslateI.h', 'Vendor.h', 'Xtos.h', 'Composite.h', 'ConstrainP.h', 'ConvertI.h', 'CoreP.h', 'EventI.h',
         'InitialI.h', 'IntrinsicI.h', 'Object.h', 'PassivGraI.h', 'RectObjP.h', 'ResourceI.h', 'Shell.h', 'ShellP.h',
         'ThreadsI.h', 'VarargsI.h', 'VendorP.h',
-        ]
+    ]
     ],
-    'dirs' : [],
+    'dirs': [],
 }
 
 moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/l/libXt/libXt-1.1.4-ictce-5.3.0.eb b/easybuild/easyconfigs/l/libXt/libXt-1.1.4-ictce-5.3.0.eb
index 978dd4006b61d796d528fd51b8d68536238144c7..6fbde3ec7e2bc00f8b0c56e83209fb1413f3f565 100644
--- a/easybuild/easyconfigs/l/libXt/libXt-1.1.4-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/l/libXt/libXt-1.1.4-ictce-5.3.0.eb
@@ -22,15 +22,15 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files' : ['include/X11/%s' % x for x in [
+    'files': ['include/X11/%s' % x for x in [
         'CallbackI.h', 'CompositeP.h', 'Constraint.h', 'Core.h', 'CreateI.h', 'HookObjI.h', 'Intrinsic.h',
         'IntrinsicP.h', 'ObjectP.h', 'RectObj.h', 'ResConfigP.h', 'SelectionI.h', 'ShellI.h', 'StringDefs.h',
         'TranslateI.h', 'Vendor.h', 'Xtos.h', 'Composite.h', 'ConstrainP.h', 'ConvertI.h', 'CoreP.h', 'EventI.h',
         'InitialI.h', 'IntrinsicI.h', 'Object.h', 'PassivGraI.h', 'RectObjP.h', 'ResourceI.h', 'Shell.h', 'ShellP.h',
         'ThreadsI.h', 'VarargsI.h', 'VendorP.h',
-        ]
+    ]
     ],
-    'dirs' : [],
+    'dirs': [],
 }
 
 moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/l/libXt/libXt-1.1.4-intel-2014b.eb b/easybuild/easyconfigs/l/libXt/libXt-1.1.4-intel-2014b.eb
index f903c018725dc61eaaa3d4700809914e277f9d21..6f7913580175e47fb1fdc3415c4a5831f52773a5 100644
--- a/easybuild/easyconfigs/l/libXt/libXt-1.1.4-intel-2014b.eb
+++ b/easybuild/easyconfigs/l/libXt/libXt-1.1.4-intel-2014b.eb
@@ -25,15 +25,15 @@ builddependencies = [
 ]
 
 sanity_check_paths = {
-    'files' : ['include/X11/%s' % x for x in [
+    'files': ['include/X11/%s' % x for x in [
         'CallbackI.h', 'CompositeP.h', 'Constraint.h', 'Core.h', 'CreateI.h', 'HookObjI.h', 'Intrinsic.h',
         'IntrinsicP.h', 'ObjectP.h', 'RectObj.h', 'ResConfigP.h', 'SelectionI.h', 'ShellI.h', 'StringDefs.h',
         'TranslateI.h', 'Vendor.h', 'Xtos.h', 'Composite.h', 'ConstrainP.h', 'ConvertI.h', 'CoreP.h', 'EventI.h',
         'InitialI.h', 'IntrinsicI.h', 'Object.h', 'PassivGraI.h', 'RectObjP.h', 'ResourceI.h', 'Shell.h', 'ShellP.h',
         'ThreadsI.h', 'VarargsI.h', 'VendorP.h',
-        ]
+    ]
     ],
-    'dirs' : [],
+    'dirs': [],
 }
 
 moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/l/libXt/libXt-1.1.4-intel-2015a-Python-2.7.10.eb b/easybuild/easyconfigs/l/libXt/libXt-1.1.4-intel-2015a-Python-2.7.10.eb
index 85062e12a32c37d19f07dd2c2f912d6151858df3..ba1f626efba94730ada6fda5eed070691ff65cfb 100644
--- a/easybuild/easyconfigs/l/libXt/libXt-1.1.4-intel-2015a-Python-2.7.10.eb
+++ b/easybuild/easyconfigs/l/libXt/libXt-1.1.4-intel-2015a-Python-2.7.10.eb
@@ -26,15 +26,15 @@ builddependencies = [
 ]
 
 sanity_check_paths = {
-    'files' : ['include/X11/%s' % x for x in [
+    'files': ['include/X11/%s' % x for x in [
         'CallbackI.h', 'CompositeP.h', 'Constraint.h', 'Core.h', 'CreateI.h', 'HookObjI.h', 'Intrinsic.h',
         'IntrinsicP.h', 'ObjectP.h', 'RectObj.h', 'ResConfigP.h', 'SelectionI.h', 'ShellI.h', 'StringDefs.h',
         'TranslateI.h', 'Vendor.h', 'Xtos.h', 'Composite.h', 'ConstrainP.h', 'ConvertI.h', 'CoreP.h', 'EventI.h',
         'InitialI.h', 'IntrinsicI.h', 'Object.h', 'PassivGraI.h', 'RectObjP.h', 'ResourceI.h', 'Shell.h', 'ShellP.h',
         'ThreadsI.h', 'VarargsI.h', 'VendorP.h',
-        ]
+    ]
     ],
-    'dirs' : [],
+    'dirs': [],
 }
 
 moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/l/libXt/libXt-1.1.4-intel-2015a-libX11-1.6.3.eb b/easybuild/easyconfigs/l/libXt/libXt-1.1.4-intel-2015a-libX11-1.6.3.eb
index 507c378340f0f54124909e8297dd53ea7202c3dc..60c2f3530476cc6fca92bfe59335138114ecad3e 100644
--- a/easybuild/easyconfigs/l/libXt/libXt-1.1.4-intel-2015a-libX11-1.6.3.eb
+++ b/easybuild/easyconfigs/l/libXt/libXt-1.1.4-intel-2015a-libX11-1.6.3.eb
@@ -27,15 +27,15 @@ builddependencies = [
 ]
 
 sanity_check_paths = {
-    'files' : ['include/X11/%s' % x for x in [
+    'files': ['include/X11/%s' % x for x in [
         'CallbackI.h', 'CompositeP.h', 'Constraint.h', 'Core.h', 'CreateI.h', 'HookObjI.h', 'Intrinsic.h',
         'IntrinsicP.h', 'ObjectP.h', 'RectObj.h', 'ResConfigP.h', 'SelectionI.h', 'ShellI.h', 'StringDefs.h',
         'TranslateI.h', 'Vendor.h', 'Xtos.h', 'Composite.h', 'ConstrainP.h', 'ConvertI.h', 'CoreP.h', 'EventI.h',
         'InitialI.h', 'IntrinsicI.h', 'Object.h', 'PassivGraI.h', 'RectObjP.h', 'ResourceI.h', 'Shell.h', 'ShellP.h',
         'ThreadsI.h', 'VarargsI.h', 'VendorP.h',
-        ]
+    ]
     ],
-    'dirs' : [],
+    'dirs': [],
 }
 
 moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/l/libXt/libXt-1.1.5-intel-2015b-Python-2.7.11.eb b/easybuild/easyconfigs/l/libXt/libXt-1.1.5-intel-2015b-Python-2.7.11.eb
index a4877fe346a6d75dca83e82ab4a7d58491f0dd10..347a5460d3b864943646cf7a621ef369a07f9255 100644
--- a/easybuild/easyconfigs/l/libXt/libXt-1.1.5-intel-2015b-Python-2.7.11.eb
+++ b/easybuild/easyconfigs/l/libXt/libXt-1.1.5-intel-2015b-Python-2.7.11.eb
@@ -26,15 +26,15 @@ builddependencies = [
 ]
 
 sanity_check_paths = {
-    'files' : ['include/X11/%s' % x for x in [
+    'files': ['include/X11/%s' % x for x in [
         'CallbackI.h', 'CompositeP.h', 'Constraint.h', 'Core.h', 'CreateI.h', 'HookObjI.h', 'Intrinsic.h',
         'IntrinsicP.h', 'ObjectP.h', 'RectObj.h', 'ResConfigP.h', 'SelectionI.h', 'ShellI.h', 'StringDefs.h',
         'TranslateI.h', 'Vendor.h', 'Xtos.h', 'Composite.h', 'ConstrainP.h', 'ConvertI.h', 'CoreP.h', 'EventI.h',
         'InitialI.h', 'IntrinsicI.h', 'Object.h', 'PassivGraI.h', 'RectObjP.h', 'ResourceI.h', 'Shell.h', 'ShellP.h',
         'ThreadsI.h', 'VarargsI.h', 'VendorP.h',
-        ]
+    ]
     ],
-    'dirs' : [],
+    'dirs': [],
 }
 
 moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/l/libXt/libXt-1.1.5-intel-2015b.eb b/easybuild/easyconfigs/l/libXt/libXt-1.1.5-intel-2015b.eb
index 9454e5904b7222317864e8a455dcc01e58d3c8f3..c0989734a0af507061cf51a422a15fb81270a6b2 100644
--- a/easybuild/easyconfigs/l/libXt/libXt-1.1.5-intel-2015b.eb
+++ b/easybuild/easyconfigs/l/libXt/libXt-1.1.5-intel-2015b.eb
@@ -25,15 +25,15 @@ builddependencies = [
 ]
 
 sanity_check_paths = {
-    'files' : ['include/X11/%s' % x for x in [
+    'files': ['include/X11/%s' % x for x in [
         'CallbackI.h', 'CompositeP.h', 'Constraint.h', 'Core.h', 'CreateI.h', 'HookObjI.h', 'Intrinsic.h',
         'IntrinsicP.h', 'ObjectP.h', 'RectObj.h', 'ResConfigP.h', 'SelectionI.h', 'ShellI.h', 'StringDefs.h',
         'TranslateI.h', 'Vendor.h', 'Xtos.h', 'Composite.h', 'ConstrainP.h', 'ConvertI.h', 'CoreP.h', 'EventI.h',
         'InitialI.h', 'IntrinsicI.h', 'Object.h', 'PassivGraI.h', 'RectObjP.h', 'ResourceI.h', 'Shell.h', 'ShellP.h',
         'ThreadsI.h', 'VarargsI.h', 'VendorP.h',
-        ]
+    ]
     ],
-    'dirs' : [],
+    'dirs': [],
 }
 
 moduleclass = 'vis'
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 63172f59f4dd403a47f737d34d293cc21fa1cdee..05588e3a1b286dea34b7c46960476a47695da07c 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
@@ -11,7 +11,7 @@ description = """A C++ SDK which contains an implementation of DAP 2.0
 
 toolchain = {'name': 'intel', 'version': '2015a'}
 
-source_urls  = ['http://www.opendap.org/pub/source/']
+source_urls = ['http://www.opendap.org/pub/source/']
 sources = [SOURCE_TAR_GZ]
 
 patches = ['%(name)s-%(version)s_flex.patch']
@@ -28,7 +28,7 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files' : ['bin/getdap', 'bin/getdap4', 'bin/dap-config', 'lib/libdap.a', 'lib/libdap.%s' % SHLIB_EXT],
+    'files': ['bin/getdap', 'bin/getdap4', 'bin/dap-config', 'lib/libdap.a', 'lib/libdap.%s' % SHLIB_EXT],
     'dirs': ['include'],
 }
 
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 f70b2b33c48480b5f21ba38dede621582cb722d3..7cb10045044af4b9dccbe1bb25f4c6391ed9c9a2 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
@@ -11,7 +11,7 @@ description = """A C++ SDK which contains an implementation of DAP 2.0
 
 toolchain = {'name': 'intel', 'version': '2015b'}
 
-source_urls  = ['http://www.opendap.org/pub/source/']
+source_urls = ['http://www.opendap.org/pub/source/']
 sources = [SOURCE_TAR_GZ]
 
 patches = ['%(name)s-%(version)s_flex.patch']
@@ -28,7 +28,7 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files' : ['bin/getdap', 'bin/getdap4', 'bin/dap-config', 'lib/libdap.a', 'lib/libdap.%s' % SHLIB_EXT],
+    'files': ['bin/getdap', 'bin/getdap4', 'bin/dap-config', 'lib/libdap.a', 'lib/libdap.%s' % SHLIB_EXT],
     'dirs': ['include'],
 }
 
diff --git a/easybuild/easyconfigs/l/libdrm/libdrm-2.4.27-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/l/libdrm/libdrm-2.4.27-goalf-1.1.0-no-OFED.eb
index dbc45bd35cc2d9284e565bec97cc52337d293eb6..35962e9634d0b963c58eec1948cfe5a121c4fed7 100644
--- a/easybuild/easyconfigs/l/libdrm/libdrm-2.4.27-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/l/libdrm/libdrm-2.4.27-goalf-1.1.0-no-OFED.eb
@@ -8,7 +8,7 @@ description = """Direct Rendering Manager runtime library."""
 
 toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
 
-source_urls  = ['http://dri.freedesktop.org/libdrm/']
+source_urls = ['http://dri.freedesktop.org/libdrm/']
 sources = [SOURCELOWER_TAR_GZ]
 
 dependencies = [
@@ -17,8 +17,8 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files' : ['include/xf86drm.h', 'include/xf86drmMode.h', 'lib/libdrm_intel.%s' % SHLIB_EXT,
-               'lib/libdrm_radeon.%s' % SHLIB_EXT, 'lib/libdrm.%s' % SHLIB_EXT, 'lib/libkms.%s' % SHLIB_EXT],
+    'files': ['include/xf86drm.h', 'include/xf86drmMode.h', 'lib/libdrm_intel.%s' % SHLIB_EXT,
+              'lib/libdrm_radeon.%s' % SHLIB_EXT, 'lib/libdrm.%s' % SHLIB_EXT, 'lib/libkms.%s' % SHLIB_EXT],
     'dirs': ['include/libdrm', 'include/libkms', 'lib/pkgconfig'],
 }
 
diff --git a/easybuild/easyconfigs/l/libdrm/libdrm-2.4.27-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libdrm/libdrm-2.4.27-goolf-1.4.10.eb
index 69b418577f7163144b4e04f55a54e12761f95cf7..81433d6c74758251a983b46c4ed2e35e874b16c4 100644
--- a/easybuild/easyconfigs/l/libdrm/libdrm-2.4.27-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/l/libdrm/libdrm-2.4.27-goolf-1.4.10.eb
@@ -8,7 +8,7 @@ description = """Direct Rendering Manager runtime library."""
 
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 
-source_urls  = ['http://dri.freedesktop.org/libdrm/']
+source_urls = ['http://dri.freedesktop.org/libdrm/']
 sources = [SOURCELOWER_TAR_GZ]
 
 dependencies = [
@@ -17,8 +17,8 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files' : ['include/xf86drm.h', 'include/xf86drmMode.h', 'lib/libdrm_intel.%s' % SHLIB_EXT,
-               'lib/libdrm_radeon.%s' % SHLIB_EXT, 'lib/libdrm.%s' % SHLIB_EXT, 'lib/libkms.%s' % SHLIB_EXT],
+    'files': ['include/xf86drm.h', 'include/xf86drmMode.h', 'lib/libdrm_intel.%s' % SHLIB_EXT,
+              'lib/libdrm_radeon.%s' % SHLIB_EXT, 'lib/libdrm.%s' % SHLIB_EXT, 'lib/libkms.%s' % SHLIB_EXT],
     'dirs': ['include/libdrm', 'include/libkms', 'lib/pkgconfig'],
 }
 
diff --git a/easybuild/easyconfigs/l/libdrm/libdrm-2.4.27-ictce-4.0.6.eb b/easybuild/easyconfigs/l/libdrm/libdrm-2.4.27-ictce-4.0.6.eb
index 390148b6934c53ea80d5d8315e71d64222a65ca1..928624815ade0945e27043b260963d7526b023de 100644
--- a/easybuild/easyconfigs/l/libdrm/libdrm-2.4.27-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/l/libdrm/libdrm-2.4.27-ictce-4.0.6.eb
@@ -8,7 +8,7 @@ description = """Direct Rendering Manager runtime library."""
 
 toolchain = {'name': 'ictce', 'version': '4.0.6'}
 
-source_urls  = ['http://dri.freedesktop.org/libdrm/']
+source_urls = ['http://dri.freedesktop.org/libdrm/']
 sources = [SOURCELOWER_TAR_GZ]
 
 dependencies = [
@@ -17,8 +17,8 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files' : ['include/xf86drm.h', 'include/xf86drmMode.h', 'lib/libdrm_intel.%s' % SHLIB_EXT,
-               'lib/libdrm_radeon.%s' % SHLIB_EXT, 'lib/libdrm.%s' % SHLIB_EXT, 'lib/libkms.%s' % SHLIB_EXT],
+    'files': ['include/xf86drm.h', 'include/xf86drmMode.h', 'lib/libdrm_intel.%s' % SHLIB_EXT,
+              'lib/libdrm_radeon.%s' % SHLIB_EXT, 'lib/libdrm.%s' % SHLIB_EXT, 'lib/libkms.%s' % SHLIB_EXT],
     'dirs': ['include/libdrm', 'include/libkms', 'lib/pkgconfig'],
 }
 
diff --git a/easybuild/easyconfigs/l/libdrm/libdrm-2.4.27-ictce-4.1.13.eb b/easybuild/easyconfigs/l/libdrm/libdrm-2.4.27-ictce-4.1.13.eb
index 0b86566ae8a6d3c942854eabef7c5f1522cf5314..726eea719ea6473b7499133782e82fcd7af7e77c 100644
--- a/easybuild/easyconfigs/l/libdrm/libdrm-2.4.27-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/l/libdrm/libdrm-2.4.27-ictce-4.1.13.eb
@@ -8,7 +8,7 @@ description = """Direct Rendering Manager runtime library."""
 
 toolchain = {'name': 'ictce', 'version': '4.1.13'}
 
-source_urls  = ['http://dri.freedesktop.org/libdrm/']
+source_urls = ['http://dri.freedesktop.org/libdrm/']
 sources = [SOURCELOWER_TAR_GZ]
 
 dependencies = [
@@ -17,8 +17,8 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files' : ['include/xf86drm.h', 'include/xf86drmMode.h', 'lib/libdrm_intel.%s' % SHLIB_EXT,
-               'lib/libdrm_radeon.%s' % SHLIB_EXT, 'lib/libdrm.%s' % SHLIB_EXT, 'lib/libkms.%s' % SHLIB_EXT],
+    'files': ['include/xf86drm.h', 'include/xf86drmMode.h', 'lib/libdrm_intel.%s' % SHLIB_EXT,
+              'lib/libdrm_radeon.%s' % SHLIB_EXT, 'lib/libdrm.%s' % SHLIB_EXT, 'lib/libkms.%s' % SHLIB_EXT],
     'dirs': ['include/libdrm', 'include/libkms', 'lib/pkgconfig'],
 }
 
diff --git a/easybuild/easyconfigs/l/libdrm/libdrm-2.4.27-ictce-5.3.0.eb b/easybuild/easyconfigs/l/libdrm/libdrm-2.4.27-ictce-5.3.0.eb
index 96c26fee1ce6012df59bf8fae15378c4460d91f1..b3743448e486ffd617cfc5aec84621a2b9d02d03 100644
--- a/easybuild/easyconfigs/l/libdrm/libdrm-2.4.27-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/l/libdrm/libdrm-2.4.27-ictce-5.3.0.eb
@@ -8,7 +8,7 @@ description = """Direct Rendering Manager runtime library."""
 
 toolchain = {'name': 'ictce', 'version': '5.3.0'}
 
-source_urls  = ['http://dri.freedesktop.org/libdrm/']
+source_urls = ['http://dri.freedesktop.org/libdrm/']
 sources = [SOURCELOWER_TAR_GZ]
 
 dependencies = [
@@ -17,8 +17,8 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files' : ['include/xf86drm.h', 'include/xf86drmMode.h', 'lib/libdrm_intel.%s' % SHLIB_EXT,
-               'lib/libdrm_radeon.%s' % SHLIB_EXT, 'lib/libdrm.%s' % SHLIB_EXT, 'lib/libkms.%s' % SHLIB_EXT],
+    'files': ['include/xf86drm.h', 'include/xf86drmMode.h', 'lib/libdrm_intel.%s' % SHLIB_EXT,
+              'lib/libdrm_radeon.%s' % SHLIB_EXT, 'lib/libdrm.%s' % SHLIB_EXT, 'lib/libkms.%s' % SHLIB_EXT],
     'dirs': ['include/libdrm', 'include/libkms', 'lib/pkgconfig'],
 }
 
diff --git a/easybuild/easyconfigs/l/libdrm/libdrm-2.4.27-ictce-5.5.0.eb b/easybuild/easyconfigs/l/libdrm/libdrm-2.4.27-ictce-5.5.0.eb
index aaa4f551989d4bf0c5c18525d23eeb61dc135873..1d6950b4e90e90295d79a38873c89588a0263d67 100644
--- a/easybuild/easyconfigs/l/libdrm/libdrm-2.4.27-ictce-5.5.0.eb
+++ b/easybuild/easyconfigs/l/libdrm/libdrm-2.4.27-ictce-5.5.0.eb
@@ -8,7 +8,7 @@ description = """Direct Rendering Manager runtime library."""
 
 toolchain = {'name': 'ictce', 'version': '5.5.0'}
 
-source_urls  = ['http://dri.freedesktop.org/libdrm/']
+source_urls = ['http://dri.freedesktop.org/libdrm/']
 sources = [SOURCELOWER_TAR_GZ]
 
 dependencies = [
@@ -17,8 +17,8 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files' : ['include/xf86drm.h', 'include/xf86drmMode.h', 'lib/libdrm_intel.%s' % SHLIB_EXT,
-               'lib/libdrm_radeon.%s' % SHLIB_EXT, 'lib/libdrm.%s' % SHLIB_EXT, 'lib/libkms.%s' % SHLIB_EXT],
+    'files': ['include/xf86drm.h', 'include/xf86drmMode.h', 'lib/libdrm_intel.%s' % SHLIB_EXT,
+              'lib/libdrm_radeon.%s' % SHLIB_EXT, 'lib/libdrm.%s' % SHLIB_EXT, 'lib/libkms.%s' % SHLIB_EXT],
     'dirs': ['include/libdrm', 'include/libkms', 'lib/pkgconfig'],
 }
 
diff --git a/easybuild/easyconfigs/l/libdrm/libdrm-2.4.59-intel-2015a.eb b/easybuild/easyconfigs/l/libdrm/libdrm-2.4.59-intel-2015a.eb
index bf98667278ba7d0d3514b656a001512e99540f38..a9bc97da287cfb78e808619aa0339b7c953eed7f 100644
--- a/easybuild/easyconfigs/l/libdrm/libdrm-2.4.59-intel-2015a.eb
+++ b/easybuild/easyconfigs/l/libdrm/libdrm-2.4.59-intel-2015a.eb
@@ -6,7 +6,7 @@ version = '2.4.59'
 homepage = 'http://dri.freedesktop.org'
 description = """Direct Rendering Manager runtime library."""
 
-source_urls  = ['http://dri.freedesktop.org/libdrm/']
+source_urls = ['http://dri.freedesktop.org/libdrm/']
 sources = [SOURCELOWER_TAR_GZ]
 
 toolchain = {'name': 'intel', 'version': '2015a'}
@@ -17,8 +17,8 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files' : ['include/xf86drm.h', 'include/xf86drmMode.h', 'lib/libdrm_intel.%s' % SHLIB_EXT,
-               'lib/libdrm_radeon.%s' % SHLIB_EXT, 'lib/libdrm.%s' % SHLIB_EXT, 'lib/libkms.%s' % SHLIB_EXT],
+    'files': ['include/xf86drm.h', 'include/xf86drmMode.h', 'lib/libdrm_intel.%s' % SHLIB_EXT,
+              'lib/libdrm_radeon.%s' % SHLIB_EXT, 'lib/libdrm.%s' % SHLIB_EXT, 'lib/libkms.%s' % SHLIB_EXT],
     'dirs': ['include/libdrm', 'include/libkms', 'lib/pkgconfig'],
 }
 
diff --git a/easybuild/easyconfigs/l/libdrm/libdrm-2.4.64-intel-2015b.eb b/easybuild/easyconfigs/l/libdrm/libdrm-2.4.64-intel-2015b.eb
index 40c401fcce832dc9a69baf983889bb18ab3f689a..699155c11d4bc4d7fece0c39d8c5b4c63f894553 100644
--- a/easybuild/easyconfigs/l/libdrm/libdrm-2.4.64-intel-2015b.eb
+++ b/easybuild/easyconfigs/l/libdrm/libdrm-2.4.64-intel-2015b.eb
@@ -6,7 +6,7 @@ version = '2.4.64'
 homepage = 'http://dri.freedesktop.org'
 description = """Direct Rendering Manager runtime library."""
 
-source_urls  = ['http://dri.freedesktop.org/libdrm/']
+source_urls = ['http://dri.freedesktop.org/libdrm/']
 sources = [SOURCELOWER_TAR_GZ]
 
 toolchain = {'name': 'intel', 'version': '2015b'}
@@ -17,8 +17,8 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files' : ['include/xf86drm.h', 'include/xf86drmMode.h', 'lib/libdrm_intel.%s' % SHLIB_EXT,
-               'lib/libdrm_radeon.%s' % SHLIB_EXT, 'lib/libdrm.%s' % SHLIB_EXT, 'lib/libkms.%s' % SHLIB_EXT],
+    'files': ['include/xf86drm.h', 'include/xf86drmMode.h', 'lib/libdrm_intel.%s' % SHLIB_EXT,
+              'lib/libdrm_radeon.%s' % SHLIB_EXT, 'lib/libdrm.%s' % SHLIB_EXT, 'lib/libkms.%s' % SHLIB_EXT],
     'dirs': ['include/libdrm', 'include/libkms', 'lib/pkgconfig'],
 }
 
diff --git a/easybuild/easyconfigs/l/libdrm/libdrm-2.4.66-intel-2015b.eb b/easybuild/easyconfigs/l/libdrm/libdrm-2.4.66-intel-2015b.eb
index 8d5e86157a1688a3590ced4b9497ea43f793cb24..c3b9d88a242030e7c406437cb974274bcfc60f6e 100644
--- a/easybuild/easyconfigs/l/libdrm/libdrm-2.4.66-intel-2015b.eb
+++ b/easybuild/easyconfigs/l/libdrm/libdrm-2.4.66-intel-2015b.eb
@@ -6,7 +6,7 @@ version = '2.4.66'
 homepage = 'http://dri.freedesktop.org'
 description = """Direct Rendering Manager runtime library."""
 
-source_urls  = ['http://dri.freedesktop.org/libdrm/']
+source_urls = ['http://dri.freedesktop.org/libdrm/']
 sources = [SOURCELOWER_TAR_GZ]
 
 toolchain = {'name': 'intel', 'version': '2015b'}
@@ -17,8 +17,8 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files' : ['include/xf86drm.h', 'include/xf86drmMode.h', 'lib/libdrm_intel.so',
-               'lib/libdrm_radeon.so', 'lib/libdrm.so', 'lib/libkms.so'],
+    'files': ['include/xf86drm.h', 'include/xf86drmMode.h', 'lib/libdrm_intel.so',
+              'lib/libdrm_radeon.so', 'lib/libdrm.so', 'lib/libkms.so'],
     'dirs': ['include/libdrm', 'include/libkms', 'lib/pkgconfig'],
 }
 
diff --git a/easybuild/easyconfigs/l/libffi/libffi-3.0.13-foss-2015b.eb b/easybuild/easyconfigs/l/libffi/libffi-3.0.13-foss-2015b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..e22ff76c36b92ba940867aebd1c99ea0dbefc3a9
--- /dev/null
+++ b/easybuild/easyconfigs/l/libffi/libffi-3.0.13-foss-2015b.eb
@@ -0,0 +1,23 @@
+easyblock = 'ConfigureMake'
+
+name = 'libffi'
+version = '3.0.13'
+
+homepage = 'http://sourceware.org/libffi/'
+description = """The libffi library provides a portable, high level programming interface to various calling
+conventions. This allows a programmer to call any function specified by a call interface description at run-time."""
+
+toolchain = {'name': 'foss', 'version': '2015b'}
+
+source_urls = [
+    'ftp://sourceware.org/pub/libffi/',
+    'http://www.mirrorservice.org/sites/sourceware.org/pub/libffi/',
+]
+sources = [SOURCELOWER_TAR_GZ]
+
+sanity_check_paths = {
+    'files': [('lib/libffi.%s' % SHLIB_EXT, 'lib64/libffi.%s' % SHLIB_EXT), ('lib/libffi.a', 'lib64/libffi.a')],
+    'dirs': [],
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libffi/libffi-3.0.13-intel-2015b.eb b/easybuild/easyconfigs/l/libffi/libffi-3.0.13-intel-2015b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..01fb77588ecbb8c7aea50d25e3dd4c784b8c0b5e
--- /dev/null
+++ b/easybuild/easyconfigs/l/libffi/libffi-3.0.13-intel-2015b.eb
@@ -0,0 +1,25 @@
+easyblock = 'ConfigureMake'
+
+name = 'libffi'
+version = '3.0.13'
+
+homepage = 'http://sourceware.org/libffi/'
+description = """The libffi library provides a portable, high level programming interface to various calling
+conventions. This allows a programmer to call any function specified by a call interface description at run-time."""
+
+toolchain = {'name': 'intel', 'version': '2015b'}
+
+source_urls = [
+    'ftp://sourceware.org/pub/libffi/',
+    'http://www.mirrorservice.org/sites/sourceware.org/pub/libffi/',
+]
+sources = [SOURCELOWER_TAR_GZ]
+
+patches = ['libffi-%(version)s_include-xmmintrin.patch']
+
+sanity_check_paths = {
+    'files': [('lib/libffi.%s' % SHLIB_EXT, 'lib64/libffi.%s' % SHLIB_EXT), ('lib/libffi.a', 'lib64/libffi.a')],
+    'dirs': [],
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libffi/libffi-3.2.1-intel-2016a.eb b/easybuild/easyconfigs/l/libffi/libffi-3.2.1-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..2096059a85ccdd386fb925f71b5157c2cc18b651
--- /dev/null
+++ b/easybuild/easyconfigs/l/libffi/libffi-3.2.1-intel-2016a.eb
@@ -0,0 +1,23 @@
+easyblock = 'ConfigureMake'
+
+name = 'libffi'
+version = '3.2.1'
+
+homepage = 'http://sourceware.org/libffi/'
+description = """The libffi library provides a portable, high level programming interface to various calling
+conventions. This allows a programmer to call any function specified by a call interface description at run-time."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+source_urls = [
+    'ftp://sourceware.org/pub/libffi/',
+    'http://www.mirrorservice.org/sites/sourceware.org/pub/libffi/',
+]
+sources = [SOURCELOWER_TAR_GZ]
+
+sanity_check_paths = {
+    'files': [('lib/libffi.%s' % SHLIB_EXT, 'lib64/libffi.%s' % SHLIB_EXT), ('lib/libffi.a', 'lib64/libffi.a')],
+    'dirs': [],
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-1.3.0-ictce-4.1.13.eb b/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-1.3.0-ictce-4.1.13.eb
index 7289b72f8d74df00faade96ff20eddea694f3ad2..2fd1231c7acf7927c50b4ac454d9eab824cad61a 100644
--- a/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-1.3.0-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-1.3.0-ictce-4.1.13.eb
@@ -21,4 +21,10 @@ dependencies = [
 configopts = "--with-jpeg8"
 runtest = "test"
 
+sanity_check_paths = {
+    'files': ['bin/cjpeg', 'bin/djpeg', 'bin/jpegtran', 'bin/rdjpgcom', 'bin/tjbench', 'bin/wrjpgcom',
+              'lib/libjpeg.a', 'lib/libjpeg.%s' % SHLIB_EXT, 'lib/libturbojpeg.a', 'lib/libturbojpeg.%s' % SHLIB_EXT],
+    'dirs': ['include', 'share'],
+}
+
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-1.3.0-intel-2014b.eb b/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-1.3.0-intel-2014b.eb
index 97496de156c0140d8501071c84e011574304a0da..d23e5354dd1b96fa872dd08f48943206bdaf42a1 100644
--- a/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-1.3.0-intel-2014b.eb
+++ b/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-1.3.0-intel-2014b.eb
@@ -21,4 +21,10 @@ dependencies = [
 configopts = "--with-jpeg8"
 runtest = "test"
 
+sanity_check_paths = {
+    'files': ['bin/cjpeg', 'bin/djpeg', 'bin/jpegtran', 'bin/rdjpgcom', 'bin/tjbench', 'bin/wrjpgcom',
+              'lib/libjpeg.a', 'lib/libjpeg.%s' % SHLIB_EXT, 'lib/libturbojpeg.a', 'lib/libturbojpeg.%s' % SHLIB_EXT],
+    'dirs': ['include', 'share'],
+}
+
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-1.3.1-goolf-1.7.20.eb b/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-1.3.1-goolf-1.7.20.eb
index d2b54d01ffffcd7378cc4f9c50b53ab0222acd4d..4a756d191d0d6353829854e246caf9383e7a0fa4 100644
--- a/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-1.3.1-goolf-1.7.20.eb
+++ b/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-1.3.1-goolf-1.7.20.eb
@@ -21,4 +21,10 @@ dependencies = [
 configopts = "--with-jpeg8"
 runtest = "test"
 
+sanity_check_paths = {
+    'files': ['bin/cjpeg', 'bin/djpeg', 'bin/jpegtran', 'bin/rdjpgcom', 'bin/tjbench', 'bin/wrjpgcom',
+              'lib/libjpeg.a', 'lib/libjpeg.%s' % SHLIB_EXT, 'lib/libturbojpeg.a', 'lib/libturbojpeg.%s' % SHLIB_EXT],
+    'dirs': ['include', 'share'],
+}
+
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-1.3.1-ictce-5.5.0.eb b/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-1.3.1-ictce-5.5.0.eb
index f611dfc78de7304d975b18520f3d5db147a10ffd..53e32391dcc40116017a7618128c401125ca03bc 100644
--- a/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-1.3.1-ictce-5.5.0.eb
+++ b/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-1.3.1-ictce-5.5.0.eb
@@ -21,4 +21,10 @@ dependencies = [
 configopts = "--with-jpeg8"
 runtest = "test"
 
+sanity_check_paths = {
+    'files': ['bin/cjpeg', 'bin/djpeg', 'bin/jpegtran', 'bin/rdjpgcom', 'bin/tjbench', 'bin/wrjpgcom',
+              'lib/libjpeg.a', 'lib/libjpeg.%s' % SHLIB_EXT, 'lib/libturbojpeg.a', 'lib/libturbojpeg.%s' % SHLIB_EXT],
+    'dirs': ['include', 'share'],
+}
+
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-1.3.1-ictce-6.2.5.eb b/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-1.3.1-ictce-6.2.5.eb
index ecec75e2301e62ab83a2271a728134b27f86650b..1f077dd9e46effddab794ae20f7f707f32677887 100644
--- a/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-1.3.1-ictce-6.2.5.eb
+++ b/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-1.3.1-ictce-6.2.5.eb
@@ -22,4 +22,10 @@ dependencies = [
 configopts = "--with-jpeg8"
 runtest = "test"
 
+sanity_check_paths = {
+    'files': ['bin/cjpeg', 'bin/djpeg', 'bin/jpegtran', 'bin/rdjpgcom', 'bin/tjbench', 'bin/wrjpgcom',
+              'lib/libjpeg.a', 'lib/libjpeg.%s' % SHLIB_EXT, 'lib/libturbojpeg.a', 'lib/libturbojpeg.%s' % SHLIB_EXT],
+    'dirs': ['include', 'share'],
+}
+
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-1.3.1-ictce-6.3.5.eb b/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-1.3.1-ictce-6.3.5.eb
index f987aae4d5e8dbf3acbd86cb1a0f908554836a0f..bdd416258ad4f694fcbd01baf3d2ca4d707be971 100644
--- a/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-1.3.1-ictce-6.3.5.eb
+++ b/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-1.3.1-ictce-6.3.5.eb
@@ -22,4 +22,10 @@ dependencies = [
 configopts = "--with-jpeg8"
 runtest = "test"
 
+sanity_check_paths = {
+    'files': ['bin/cjpeg', 'bin/djpeg', 'bin/jpegtran', 'bin/rdjpgcom', 'bin/tjbench', 'bin/wrjpgcom',
+              'lib/libjpeg.a', 'lib/libjpeg.%s' % SHLIB_EXT, 'lib/libturbojpeg.a', 'lib/libturbojpeg.%s' % SHLIB_EXT],
+    'dirs': ['include', 'share'],
+}
+
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-1.3.1-intel-2014.06.eb b/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-1.3.1-intel-2014.06.eb
index c76e470179f8b40856715ca806c15b5e4250563a..9186528df63602891bdfd3ecb1ea009df5dd5ea4 100644
--- a/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-1.3.1-intel-2014.06.eb
+++ b/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-1.3.1-intel-2014.06.eb
@@ -21,4 +21,10 @@ dependencies = [
 configopts = "--with-jpeg8"
 runtest = "test"
 
+sanity_check_paths = {
+    'files': ['bin/cjpeg', 'bin/djpeg', 'bin/jpegtran', 'bin/rdjpgcom', 'bin/tjbench', 'bin/wrjpgcom',
+              'lib/libjpeg.a', 'lib/libjpeg.%s' % SHLIB_EXT, 'lib/libturbojpeg.a', 'lib/libturbojpeg.%s' % SHLIB_EXT],
+    'dirs': ['include', 'share'],
+}
+
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-1.3.1-intel-2014b.eb b/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-1.3.1-intel-2014b.eb
index 70fac12c9e17f65a112db217b12ad3e6b6683c2e..8e30c1bc84df2c549542fbf9714f6201193cd149 100644
--- a/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-1.3.1-intel-2014b.eb
+++ b/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-1.3.1-intel-2014b.eb
@@ -21,4 +21,10 @@ dependencies = [
 configopts = "--with-jpeg8"
 runtest = "test"
 
+sanity_check_paths = {
+    'files': ['bin/cjpeg', 'bin/djpeg', 'bin/jpegtran', 'bin/rdjpgcom', 'bin/tjbench', 'bin/wrjpgcom',
+              'lib/libjpeg.a', 'lib/libjpeg.%s' % SHLIB_EXT, 'lib/libturbojpeg.a', 'lib/libturbojpeg.%s' % SHLIB_EXT],
+    'dirs': ['include', 'share'],
+}
+
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-1.3.1-intel-2015a.eb b/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-1.3.1-intel-2015a.eb
index d6bc643d578d7a83bb3cb8b97749e7681fe92881..ad986ffea8da379c8c81b63260b505c353b7153b 100644
--- a/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-1.3.1-intel-2015a.eb
+++ b/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-1.3.1-intel-2015a.eb
@@ -21,4 +21,10 @@ dependencies = [
 configopts = "--with-jpeg8"
 runtest = "test"
 
+sanity_check_paths = {
+    'files': ['bin/cjpeg', 'bin/djpeg', 'bin/jpegtran', 'bin/rdjpgcom', 'bin/tjbench', 'bin/wrjpgcom',
+              'lib/libjpeg.a', 'lib/libjpeg.%s' % SHLIB_EXT, 'lib/libturbojpeg.a', 'lib/libturbojpeg.%s' % SHLIB_EXT],
+    'dirs': ['include', 'share'],
+}
+
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-1.4.0-foss-2015a.eb b/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-1.4.0-foss-2015a.eb
index 57eea7cba0e29b79f3f0990099af6574f2e1bf70..5e83491d3f0aa4c6c79a473d2980a31e44522a48 100644
--- a/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-1.4.0-foss-2015a.eb
+++ b/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-1.4.0-foss-2015a.eb
@@ -21,4 +21,10 @@ dependencies = [
 configopts = "--with-jpeg8"
 runtest = "test"
 
+sanity_check_paths = {
+    'files': ['bin/cjpeg', 'bin/djpeg', 'bin/jpegtran', 'bin/rdjpgcom', 'bin/tjbench', 'bin/wrjpgcom',
+              'lib/libjpeg.a', 'lib/libjpeg.%s' % SHLIB_EXT, 'lib/libturbojpeg.a', 'lib/libturbojpeg.%s' % SHLIB_EXT],
+    'dirs': ['include', 'share'],
+}
+
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-1.4.0-goolf-1.5.14.eb b/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-1.4.0-goolf-1.5.14.eb
index 6af6464ee63d3801bef90d025cf0fa5653741d79..85a9c802fa2d1aa1e193bcaf7ff6f082de838f86 100644
--- a/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-1.4.0-goolf-1.5.14.eb
+++ b/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-1.4.0-goolf-1.5.14.eb
@@ -21,4 +21,10 @@ dependencies = [
 configopts = "--with-jpeg8"
 runtest = "test"
 
+sanity_check_paths = {
+    'files': ['bin/cjpeg', 'bin/djpeg', 'bin/jpegtran', 'bin/rdjpgcom', 'bin/tjbench', 'bin/wrjpgcom',
+              'lib/libjpeg.a', 'lib/libjpeg.%s' % SHLIB_EXT, 'lib/libturbojpeg.a', 'lib/libturbojpeg.%s' % SHLIB_EXT],
+    'dirs': ['include', 'share'],
+}
+
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-1.4.0-goolf-1.7.20.eb b/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-1.4.0-goolf-1.7.20.eb
index 4197b7c6358b2d6621a0b6789dee75b0a9fe7fd9..e148186d4c5444c88c5ea5e6f32b7bf8275b62ea 100644
--- a/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-1.4.0-goolf-1.7.20.eb
+++ b/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-1.4.0-goolf-1.7.20.eb
@@ -21,4 +21,10 @@ dependencies = [
 configopts = "--with-jpeg8"
 runtest = "test"
 
+sanity_check_paths = {
+    'files': ['bin/cjpeg', 'bin/djpeg', 'bin/jpegtran', 'bin/rdjpgcom', 'bin/tjbench', 'bin/wrjpgcom',
+              'lib/libjpeg.a', 'lib/libjpeg.%s' % SHLIB_EXT, 'lib/libturbojpeg.a', 'lib/libturbojpeg.%s' % SHLIB_EXT],
+    'dirs': ['include', 'share'],
+}
+
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-1.4.0-ictce-7.3.5.eb b/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-1.4.0-ictce-7.3.5.eb
index 24b1cf1a07384678a528f0a37f68701277867390..f76124a8a3c4a1e9e3839f693d9474474931390f 100644
--- a/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-1.4.0-ictce-7.3.5.eb
+++ b/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-1.4.0-ictce-7.3.5.eb
@@ -21,4 +21,10 @@ dependencies = [
 configopts = "--with-jpeg8"
 runtest = "test"
 
+sanity_check_paths = {
+    'files': ['bin/cjpeg', 'bin/djpeg', 'bin/jpegtran', 'bin/rdjpgcom', 'bin/tjbench', 'bin/wrjpgcom',
+              'lib/libjpeg.a', 'lib/libjpeg.%s' % SHLIB_EXT, 'lib/libturbojpeg.a', 'lib/libturbojpeg.%s' % SHLIB_EXT],
+    'dirs': ['include', 'share'],
+}
+
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-1.4.0-intel-2015a.eb b/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-1.4.0-intel-2015a.eb
index 765e1c4ea1d6d8bd7f5b713ee50a9f1ff206de81..e15ae065d4497161a8e3d51bd17ad7dc240d596f 100644
--- a/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-1.4.0-intel-2015a.eb
+++ b/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-1.4.0-intel-2015a.eb
@@ -21,4 +21,10 @@ dependencies = [
 configopts = "--with-jpeg8"
 runtest = "test"
 
+sanity_check_paths = {
+    'files': ['bin/cjpeg', 'bin/djpeg', 'bin/jpegtran', 'bin/rdjpgcom', 'bin/tjbench', 'bin/wrjpgcom',
+              'lib/libjpeg.a', 'lib/libjpeg.%s' % SHLIB_EXT, 'lib/libturbojpeg.a', 'lib/libturbojpeg.%s' % SHLIB_EXT],
+    'dirs': ['include', 'share'],
+}
+
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-1.4.0-intel-2015b.eb b/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-1.4.0-intel-2015b.eb
index 2bb0e8f9bccece1ea83e7d126a4c4333511223da..eab64da24e2dbff8d15ddd5fe2b448063237e1fa 100644
--- a/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-1.4.0-intel-2015b.eb
+++ b/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-1.4.0-intel-2015b.eb
@@ -21,4 +21,10 @@ dependencies = [
 configopts = "--with-jpeg8"
 runtest = "test"
 
+sanity_check_paths = {
+    'files': ['bin/cjpeg', 'bin/djpeg', 'bin/jpegtran', 'bin/rdjpgcom', 'bin/tjbench', 'bin/wrjpgcom',
+              'lib/libjpeg.a', 'lib/libjpeg.%s' % SHLIB_EXT, 'lib/libturbojpeg.a', 'lib/libturbojpeg.%s' % SHLIB_EXT],
+    'dirs': ['include', 'share'],
+}
+
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-1.4.1-foss-2015b.eb b/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-1.4.1-foss-2015b.eb
index eb2697c94d08b4710f1cffa66b8fce30553cdaa9..eb2ff2229c0c40014ed92185a9c26f6af5c05f9e 100644
--- a/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-1.4.1-foss-2015b.eb
+++ b/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-1.4.1-foss-2015b.eb
@@ -21,4 +21,10 @@ dependencies = [
 configopts = "--with-jpeg8"
 runtest = "test"
 
+sanity_check_paths = {
+    'files': ['bin/cjpeg', 'bin/djpeg', 'bin/jpegtran', 'bin/rdjpgcom', 'bin/tjbench', 'bin/wrjpgcom',
+              'lib/libjpeg.a', 'lib/libjpeg.%s' % SHLIB_EXT, 'lib/libturbojpeg.a', 'lib/libturbojpeg.%s' % SHLIB_EXT],
+    'dirs': ['include', 'share'],
+}
+
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-1.4.1-goolf-1.7.20.eb b/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-1.4.1-goolf-1.7.20.eb
index af63e0180b6b98482efd3f63120aa269b0e705cb..fb752c1fdd663bb56a755663923ec1969468eca7 100644
--- a/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-1.4.1-goolf-1.7.20.eb
+++ b/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-1.4.1-goolf-1.7.20.eb
@@ -21,4 +21,10 @@ dependencies = [
 configopts = "--with-jpeg8"
 runtest = "test"
 
+sanity_check_paths = {
+    'files': ['bin/cjpeg', 'bin/djpeg', 'bin/jpegtran', 'bin/rdjpgcom', 'bin/tjbench', 'bin/wrjpgcom',
+              'lib/libjpeg.a', 'lib/libjpeg.%s' % SHLIB_EXT, 'lib/libturbojpeg.a', 'lib/libturbojpeg.%s' % SHLIB_EXT],
+    'dirs': ['include', 'share'],
+}
+
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-1.4.1-intel-2015a.eb b/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-1.4.1-intel-2015a.eb
index 3f922516d94cf412d1116db53cd2f7f811bdac65..76f9c8ecfe962888f330058de7a0e883789c1c63 100644
--- a/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-1.4.1-intel-2015a.eb
+++ b/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-1.4.1-intel-2015a.eb
@@ -21,4 +21,10 @@ dependencies = [
 configopts = "--with-jpeg8"
 runtest = "test"
 
+sanity_check_paths = {
+    'files': ['bin/cjpeg', 'bin/djpeg', 'bin/jpegtran', 'bin/rdjpgcom', 'bin/tjbench', 'bin/wrjpgcom',
+              'lib/libjpeg.a', 'lib/libjpeg.%s' % SHLIB_EXT, 'lib/libturbojpeg.a', 'lib/libturbojpeg.%s' % SHLIB_EXT],
+    'dirs': ['include', 'share'],
+}
+
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-1.4.1-intel-2015b.eb b/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-1.4.1-intel-2015b.eb
index 49b99b98b32ddc0fbac101c331e38e452186e871..312b7f35a9c9349792b33c557a791f7c69cb4231 100644
--- a/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-1.4.1-intel-2015b.eb
+++ b/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-1.4.1-intel-2015b.eb
@@ -21,4 +21,10 @@ dependencies = [
 configopts = "--with-jpeg8"
 runtest = "test"
 
+sanity_check_paths = {
+    'files': ['bin/cjpeg', 'bin/djpeg', 'bin/jpegtran', 'bin/rdjpgcom', 'bin/tjbench', 'bin/wrjpgcom',
+              'lib/libjpeg.a', 'lib/libjpeg.%s' % SHLIB_EXT, 'lib/libturbojpeg.a', 'lib/libturbojpeg.%s' % SHLIB_EXT],
+    'dirs': ['include', 'share'],
+}
+
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-1.4.2-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-1.4.2-goolf-1.4.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..c9cc4d2e6fc67d244b3acef1099d72eef0698c10
--- /dev/null
+++ b/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-1.4.2-goolf-1.4.10.eb
@@ -0,0 +1,30 @@
+easyblock = 'ConfigureMake'
+
+name = 'libjpeg-turbo'
+version = '1.4.2'
+
+homepage = 'http://sourceforge.net/libjpeg-turbo/'
+description = """libjpeg-turbo is a fork of the original IJG libjpeg which uses SIMD to accelerate baseline JPEG 
+compression and decompression. libjpeg is a library that implements JPEG image encoding, decoding and transcoding.
+"""
+
+toolchain = {'name': 'goolf', 'version': '1.4.10'}
+toolchainopts = {'pic': True}
+
+source_urls = [SOURCEFORGE_SOURCE]
+sources = [SOURCELOWER_TAR_GZ]
+
+dependencies = [
+    ('NASM', '2.11.08'),
+]
+
+configopts = "--with-jpeg8"
+runtest = "test"
+
+sanity_check_paths = {
+    'files': ['bin/cjpeg', 'bin/djpeg', 'bin/jpegtran', 'bin/rdjpgcom', 'bin/tjbench', 'bin/wrjpgcom',
+              'lib/libjpeg.a', 'lib/libjpeg.%s' % SHLIB_EXT, 'lib/libturbojpeg.a', 'lib/libturbojpeg.%s' % SHLIB_EXT],
+    'dirs': ['include', 'share/man'],
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-1.4.2-intel-2015b.eb b/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-1.4.2-intel-2015b.eb
index 11356694c2a864036d8023db60b344af5c1495c0..a9bd6e350023fc349170dd5b4a22d8d2059d74d0 100644
--- a/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-1.4.2-intel-2015b.eb
+++ b/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-1.4.2-intel-2015b.eb
@@ -21,4 +21,10 @@ dependencies = [
 configopts = "--with-jpeg8"
 runtest = "test"
 
+sanity_check_paths = {
+    'files': ['bin/cjpeg', 'bin/djpeg', 'bin/jpegtran', 'bin/rdjpgcom', 'bin/tjbench', 'bin/wrjpgcom',
+              'lib/libjpeg.a', 'lib/libjpeg.%s' % SHLIB_EXT, 'lib/libturbojpeg.a', 'lib/libturbojpeg.%s' % SHLIB_EXT],
+    'dirs': ['include', 'share'],
+}
+
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-1.4.2-intel-2016a.eb b/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-1.4.2-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..c23fea50a0e1b67b6c1591b71a1c81b85bbe3913
--- /dev/null
+++ b/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-1.4.2-intel-2016a.eb
@@ -0,0 +1,30 @@
+easyblock = 'ConfigureMake'
+
+name = 'libjpeg-turbo'
+version = '1.4.2'
+
+homepage = 'http://sourceforge.net/projects/libjpeg-turbo/'
+description = """libjpeg-turbo is a fork of the original IJG libjpeg which uses SIMD to accelerate baseline JPEG
+compression and decompression. libjpeg is a library that implements JPEG image encoding, decoding and transcoding.
+"""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+toolchainopts = {'pic': True}
+
+source_urls = [SOURCEFORGE_SOURCE]
+sources = [SOURCELOWER_TAR_GZ]
+
+dependencies = [
+    ('NASM', '2.11.08'),
+]
+
+configopts = "--with-jpeg8"
+runtest = "test"
+
+sanity_check_paths = {
+    'files': ['bin/cjpeg', 'bin/djpeg', 'bin/jpegtran', 'bin/rdjpgcom', 'bin/tjbench', 'bin/wrjpgcom',
+              'lib/libjpeg.a', 'lib/libjpeg.%s' % SHLIB_EXT, 'lib/libturbojpeg.a', 'lib/libturbojpeg.%s' % SHLIB_EXT],
+    'dirs': ['include', 'share'],
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libmatheval/libmatheval-1.1.11-foss-2015b.eb b/easybuild/easyconfigs/l/libmatheval/libmatheval-1.1.11-foss-2015b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..2fd935d0b5e5b5100d7893e711c282d54c805e23
--- /dev/null
+++ b/easybuild/easyconfigs/l/libmatheval/libmatheval-1.1.11-foss-2015b.eb
@@ -0,0 +1,33 @@
+easyblock = 'ConfigureMake'
+
+name = 'libmatheval'
+version = '1.1.11'
+
+homepage = 'http://www.gnu.org/software/libmatheval/'
+description = """GNU libmatheval is a library (callable from C and Fortran) to parse
+ and evaluate symbolic expressions input as text."""
+
+toolchain = {'name': 'foss', 'version': '2015b'}
+toolchainopts = {'pic': True}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = [GNU_SOURCE]
+
+dependencies = [
+    ('flex', '2.5.39'),
+    ('Bison', '3.0.4'),
+    ('byacc', '20150711'),
+    ('guile', '1.8.8'),
+]
+
+configopts = '--with-pic '
+
+# fix for guile-config being broken because shebang line contains full path to bin/guile
+configopts += 'GUILE_CONFIG="$EBROOTGUILE/bin/guile -e main -s $EBROOTGUILE/bin/guile-config"'
+
+sanity_check_paths = {
+    'files': ['lib/libmatheval.a', 'include/matheval.h'],
+    'dirs': [],
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libmatheval/libmatheval-1.1.11-intel-2015b.eb b/easybuild/easyconfigs/l/libmatheval/libmatheval-1.1.11-intel-2015b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..5c07ab422c00b5f43f6641ccebbd687d59137667
--- /dev/null
+++ b/easybuild/easyconfigs/l/libmatheval/libmatheval-1.1.11-intel-2015b.eb
@@ -0,0 +1,33 @@
+easyblock = 'ConfigureMake'
+
+name = 'libmatheval'
+version = '1.1.11'
+
+homepage = 'http://www.gnu.org/software/libmatheval/'
+description = """GNU libmatheval is a library (callable from C and Fortran) to parse
+ and evaluate symbolic expressions input as text."""
+
+toolchain = {'name': 'intel', 'version': '2015b'}
+toolchainopts = {'pic': True}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = [GNU_SOURCE]
+
+dependencies = [
+    ('flex', '2.5.39'),
+    ('Bison', '3.0.4'),
+    ('byacc', '20150711'),
+    ('guile', '1.8.8'),
+]
+
+configopts = '--with-pic '
+
+# fix for guile-config being broken because shebang line contains full path to bin/guile
+configopts += 'GUILE_CONFIG="$EBROOTGUILE/bin/guile -e main -s $EBROOTGUILE/bin/guile-config"'
+
+sanity_check_paths = {
+    'files': ['lib/libmatheval.a', 'include/matheval.h'],
+    'dirs': [],
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libpng/libpng-1.6.20-foss-2015a.eb b/easybuild/easyconfigs/l/libpng/libpng-1.6.20-foss-2015a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..94bb4e0c8fe2b61a46e3184e22cf904966931b9f
--- /dev/null
+++ b/easybuild/easyconfigs/l/libpng/libpng-1.6.20-foss-2015a.eb
@@ -0,0 +1,19 @@
+easyblock = 'ConfigureMake'
+
+name = 'libpng'
+version = '1.6.20'
+
+homepage = 'http://www.libpng.org/pub/png/libpng.html'
+description = "libpng is the official PNG reference library"
+
+toolchain = {'name': 'foss', 'version': '2015a'}
+toolchainopts = {'pic': True}
+
+source_urls = [SOURCEFORGE_SOURCE]
+sources = [SOURCELOWER_TAR_GZ]
+
+dependencies = [('zlib', '1.2.8')]
+
+configopts = "--with-pic"
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libpng/libpng-1.6.21-intel-2015b.eb b/easybuild/easyconfigs/l/libpng/libpng-1.6.21-intel-2015b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..b76c98f402c7edf7b69faf1a9aa3066c2151dfba
--- /dev/null
+++ b/easybuild/easyconfigs/l/libpng/libpng-1.6.21-intel-2015b.eb
@@ -0,0 +1,26 @@
+easyblock = 'ConfigureMake'
+
+name = 'libpng'
+version = '1.6.21'
+
+homepage = 'http://www.libpng.org/pub/png/libpng.html'
+description = "libpng is the official PNG reference library"
+
+toolchain = {'name': 'intel', 'version': '2015b'}
+toolchainopts = {'pic': True}
+
+source_urls = [SOURCEFORGE_SOURCE]
+sources = [SOURCELOWER_TAR_GZ]
+
+dependencies = [('zlib', '1.2.8')]
+
+configopts = "--with-pic"
+
+majminver = ''.join(version.split('.')[:2])
+sanity_check_paths = {
+    'files': ['include/pngconf.h', 'include/png.h', 'include/pnglibconf.h', 'lib/libpng.a',
+              'lib/libpng.%s' % SHLIB_EXT, 'lib/libpng%s.a' % majminver, 'lib/libpng%s.%s' %(majminver, SHLIB_EXT)],
+    'dirs': ['bin', 'include/libpng%s' % majminver, 'share/man'],
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libpng/libpng-1.6.21-intel-2016a.eb b/easybuild/easyconfigs/l/libpng/libpng-1.6.21-intel-2016a.eb
index 7ea89634eb146ce48a48a7ffc1cdacd97e85d282..db360bc83f648592127172590029b4a9c92e01fd 100644
--- a/easybuild/easyconfigs/l/libpng/libpng-1.6.21-intel-2016a.eb
+++ b/easybuild/easyconfigs/l/libpng/libpng-1.6.21-intel-2016a.eb
@@ -19,7 +19,7 @@ configopts = "--with-pic"
 majminver = ''.join(version.split('.')[:2])
 sanity_check_paths = {
     'files': ['include/pngconf.h', 'include/png.h', 'include/pnglibconf.h', 'lib/libpng.a',
-              'lib/libpng.%s' % SHLIB_EXT, 'lib/libpng%s.a' % majminver, 'lib/libpng%s.%s' %(majminver, SHLIB_EXT)],
+              'lib/libpng.%s' % SHLIB_EXT, 'lib/libpng%s.a' % majminver, 'lib/libpng%s.%s' % (majminver, SHLIB_EXT)],
     'dirs': ['bin', 'include/libpng%s' % majminver, 'share/man'],
 }
 
diff --git a/easybuild/easyconfigs/l/libpthread-stubs/libpthread-stubs-0.3-foss-2014b.eb b/easybuild/easyconfigs/l/libpthread-stubs/libpthread-stubs-0.3-foss-2014b.eb
index 9e928c536ded433eff3f4f66653ad708399fde6d..a10468dde6a6c0cd2307787b8dbb409a1d7dce43 100644
--- a/easybuild/easyconfigs/l/libpthread-stubs/libpthread-stubs-0.3-foss-2014b.eb
+++ b/easybuild/easyconfigs/l/libpthread-stubs/libpthread-stubs-0.3-foss-2014b.eb
@@ -7,14 +7,14 @@ 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."""
 
-source_urls  = ['http://xcb.freedesktop.org/dist/']
+source_urls = ['http://xcb.freedesktop.org/dist/']
 sources = [SOURCELOWER_TAR_GZ]
 
 toolchain = {'name': 'foss', 'version': '2014b'}
 
 sanity_check_paths = {
-    'files' : ['lib/pkgconfig/pthread-stubs.pc'],
-    'dirs': [] ,
+    'files': ['lib/pkgconfig/pthread-stubs.pc'],
+    'dirs': [],
 }
 
 moduleclass = 'lib'
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 9739f76ef1f2a4ab0b1711e06dbf3da52d820198..511ed358b04b4fd63f36fa164aa2c6e9fb5787e9 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
@@ -7,14 +7,14 @@ 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."""
 
-source_urls  = ['http://xcb.freedesktop.org/dist/']
+source_urls = ['http://xcb.freedesktop.org/dist/']
 sources = [SOURCELOWER_TAR_GZ]
 
 toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
 
 sanity_check_paths = {
-                      'files' : ['lib/pkgconfig/pthread-stubs.pc'],
-                      'dirs': []
-                     }
+    'files': ['lib/pkgconfig/pthread-stubs.pc'],
+    '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 1a74d61a74a330bb66e29e6483b2d43664bb3d78..211abf16ff97787cac29f6a27529049720435f6a 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
@@ -7,13 +7,13 @@ 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."""
 
-source_urls  = ['http://xcb.freedesktop.org/dist/']
+source_urls = ['http://xcb.freedesktop.org/dist/']
 sources = [SOURCELOWER_TAR_GZ]
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 
 sanity_check_paths = {
-                      'files' : ['lib/pkgconfig/pthread-stubs.pc'],
-                      'dirs': []
-                     }
+    'files': ['lib/pkgconfig/pthread-stubs.pc'],
+    '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 f71c39521be9e1639fac2a5fe441b494ad5f9130..1ab3a5ccf45b964edcd45d9663e688e29965f865 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
@@ -7,14 +7,14 @@ 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."""
 
-source_urls  = ['http://xcb.freedesktop.org/dist/']
+source_urls = ['http://xcb.freedesktop.org/dist/']
 sources = [SOURCELOWER_TAR_GZ]
 
 toolchain = {'name': 'ictce', 'version': '4.0.6'}
 
 sanity_check_paths = {
-                      'files' : ['lib/pkgconfig/pthread-stubs.pc'],
-                      'dirs': []
-                     }
+    'files': ['lib/pkgconfig/pthread-stubs.pc'],
+    'dirs': []
+}
 
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libpthread-stubs/libpthread-stubs-0.3-ictce-4.1.13.eb b/easybuild/easyconfigs/l/libpthread-stubs/libpthread-stubs-0.3-ictce-4.1.13.eb
index f73ab22a6e0cb10e444f4e441f4b24f911227d63..8d7fb1e79f2c73f4fd8bc2e615e8d81488a8937f 100644
--- a/easybuild/easyconfigs/l/libpthread-stubs/libpthread-stubs-0.3-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/l/libpthread-stubs/libpthread-stubs-0.3-ictce-4.1.13.eb
@@ -7,14 +7,14 @@ 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."""
 
-source_urls  = ['http://xcb.freedesktop.org/dist/']
+source_urls = ['http://xcb.freedesktop.org/dist/']
 sources = [SOURCELOWER_TAR_GZ]
 
 toolchain = {'name': 'ictce', 'version': '4.1.13'}
 
 sanity_check_paths = {
-    'files' : ['lib/pkgconfig/pthread-stubs.pc'],
-    'dirs': [] ,
+    'files': ['lib/pkgconfig/pthread-stubs.pc'],
+    '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 8789568941c8f1517a72dab0b0d6da78360cad23..ea261c17d214ff71069e1e6fa84ecb8aa27f1f21 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
@@ -7,15 +7,15 @@ 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."""
 
-source_urls  = ['http://xcb.freedesktop.org/dist/']
+source_urls = ['http://xcb.freedesktop.org/dist/']
 sources = [SOURCELOWER_TAR_GZ]
 
 
 toolchain = {'name': 'ictce', 'version': '5.3.0'}
 
 sanity_check_paths = {
-                      'files' : ['lib/pkgconfig/pthread-stubs.pc'],
-                      'dirs': []
-                     }
+    'files': ['lib/pkgconfig/pthread-stubs.pc'],
+    'dirs': []
+}
 
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libpthread-stubs/libpthread-stubs-0.3-ictce-5.5.0.eb b/easybuild/easyconfigs/l/libpthread-stubs/libpthread-stubs-0.3-ictce-5.5.0.eb
index 718b266c0abb9341e2150eb827c82e976c757da1..ef620135593732f4b0a007fe6765425dfb9130f4 100644
--- a/easybuild/easyconfigs/l/libpthread-stubs/libpthread-stubs-0.3-ictce-5.5.0.eb
+++ b/easybuild/easyconfigs/l/libpthread-stubs/libpthread-stubs-0.3-ictce-5.5.0.eb
@@ -7,14 +7,14 @@ 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."""
 
-source_urls  = ['http://xcb.freedesktop.org/dist/']
+source_urls = ['http://xcb.freedesktop.org/dist/']
 sources = [SOURCELOWER_TAR_GZ]
 
 toolchain = {'name': 'ictce', 'version': '5.5.0'}
 
 sanity_check_paths = {
-    'files' : ['lib/pkgconfig/pthread-stubs.pc'],
-    'dirs': [] ,
+    'files': ['lib/pkgconfig/pthread-stubs.pc'],
+    'dirs': [],
 }
 
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libpthread-stubs/libpthread-stubs-0.3-intel-2014b.eb b/easybuild/easyconfigs/l/libpthread-stubs/libpthread-stubs-0.3-intel-2014b.eb
index 46dee523f9afb65b6caf1a994885c3cb04202f40..6b19a1bcd1da0224ec05a357c514462174d72ce8 100644
--- a/easybuild/easyconfigs/l/libpthread-stubs/libpthread-stubs-0.3-intel-2014b.eb
+++ b/easybuild/easyconfigs/l/libpthread-stubs/libpthread-stubs-0.3-intel-2014b.eb
@@ -7,14 +7,14 @@ 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."""
 
-source_urls  = ['http://xcb.freedesktop.org/dist/']
+source_urls = ['http://xcb.freedesktop.org/dist/']
 sources = [SOURCELOWER_TAR_GZ]
 
 toolchain = {'name': 'intel', 'version': '2014b'}
 
 sanity_check_paths = {
-    'files' : ['lib/pkgconfig/pthread-stubs.pc'],
-    'dirs': [] ,
+    'files': ['lib/pkgconfig/pthread-stubs.pc'],
+    'dirs': [],
 }
 
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libpthread-stubs/libpthread-stubs-0.3-intel-2015a.eb b/easybuild/easyconfigs/l/libpthread-stubs/libpthread-stubs-0.3-intel-2015a.eb
index 36651021047a5a4d6bce58f1a6dd71ca348dd741..fca6a0816804debe642f9c6a45bd2fb94931ed7e 100644
--- a/easybuild/easyconfigs/l/libpthread-stubs/libpthread-stubs-0.3-intel-2015a.eb
+++ b/easybuild/easyconfigs/l/libpthread-stubs/libpthread-stubs-0.3-intel-2015a.eb
@@ -7,14 +7,14 @@ 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."""
 
-source_urls  = ['http://xcb.freedesktop.org/dist/']
+source_urls = ['http://xcb.freedesktop.org/dist/']
 sources = [SOURCELOWER_TAR_GZ]
 
 toolchain = {'name': 'intel', 'version': '2015a'}
 
 sanity_check_paths = {
-    'files' : ['lib/pkgconfig/pthread-stubs.pc'],
-    'dirs': [] ,
+    'files': ['lib/pkgconfig/pthread-stubs.pc'],
+    'dirs': [],
 }
 
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libpthread-stubs/libpthread-stubs-0.3-intel-2015b.eb b/easybuild/easyconfigs/l/libpthread-stubs/libpthread-stubs-0.3-intel-2015b.eb
index aec5e572ed621a14dd644e4a636d761790e40515..b147185e9d1957110eef6d4b174825b4e4df5af7 100644
--- a/easybuild/easyconfigs/l/libpthread-stubs/libpthread-stubs-0.3-intel-2015b.eb
+++ b/easybuild/easyconfigs/l/libpthread-stubs/libpthread-stubs-0.3-intel-2015b.eb
@@ -7,14 +7,14 @@ 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."""
 
-source_urls  = ['http://xcb.freedesktop.org/dist/']
+source_urls = ['http://xcb.freedesktop.org/dist/']
 sources = [SOURCELOWER_TAR_GZ]
 
 toolchain = {'name': 'intel', 'version': '2015b'}
 
 sanity_check_paths = {
-    'files' : ['lib/pkgconfig/pthread-stubs.pc'],
-    'dirs': [] ,
+    'files': ['lib/pkgconfig/pthread-stubs.pc'],
+    'dirs': [],
 }
 
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgmpolf-1.1.6.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgmpolf-1.1.6.eb
index f9b6b2a61b0745d7c93e5e557a180aaa176d313a..17ca0fce10780c03c992cf8f78ff36459e4eab0e 100644
--- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgmpolf-1.1.6.eb
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgmpolf-1.1.6.eb
@@ -21,10 +21,10 @@ dependencies = [('ncurses', '5.9-20130406')]
 preconfigopts = "LDFLAGS='-lncurses'"
 
 sanity_check_paths = {
-    'files' : ['lib/libreadline.a', 'lib/libhistory.a'] +
-              ['include/readline/%s' % x for x in ['chardefs.h', 'history.h', 'keymaps.h', 'readline.h', 'rlconf.h',
-                                                   'rlstdc.h', 'rltypedefs.h', 'tilde.h']],
-    'dirs' : [],
+    'files': ['lib/libreadline.a', 'lib/libhistory.a'] +
+             ['include/readline/%s' % x for x in ['chardefs.h', 'history.h', 'keymaps.h', 'readline.h', 'rlconf.h',
+                                                  'rlstdc.h', 'rltypedefs.h', 'tilde.h']],
+    'dirs': [],
 }
 
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgmvolf-1.1.12rc1.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgmvolf-1.1.12rc1.eb
index 3eb170a630489045f58a27ee3d9de5a763d4d574..8d2ea29b4ccb46917e2fb6b1aba8bb3791c309ae 100644
--- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgmvolf-1.1.12rc1.eb
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgmvolf-1.1.12rc1.eb
@@ -21,10 +21,10 @@ dependencies = [('ncurses', '5.9-20130406')]
 preconfigopts = "LDFLAGS='-lncurses'"
 
 sanity_check_paths = {
-    'files' : ['lib/libreadline.a', 'lib/libhistory.a'] +
-              ['include/readline/%s' % x for x in ['chardefs.h', 'history.h', 'keymaps.h', 'readline.h', 'rlconf.h',
-                                                   'rlstdc.h', 'rltypedefs.h', 'tilde.h']],
-    'dirs' : [],
+    'files': ['lib/libreadline.a', 'lib/libhistory.a'] +
+             ['include/readline/%s' % x for x in ['chardefs.h', 'history.h', 'keymaps.h', 'readline.h', 'rlconf.h',
+                                                  'rlstdc.h', 'rltypedefs.h', 'tilde.h']],
+    'dirs': [],
 }
 
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgmvolf-1.2.7.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgmvolf-1.2.7.eb
index b1fad1251e52a9a7bbdea99c5f7c70b85967f7f7..aea7099ee49367d5d3ac4f4284a74fd2900710a0 100644
--- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgmvolf-1.2.7.eb
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgmvolf-1.2.7.eb
@@ -21,10 +21,10 @@ dependencies = [('ncurses', '5.9-20130406')]
 preconfigopts = "LDFLAGS='-lncurses'"
 
 sanity_check_paths = {
-    'files' : ['lib/libreadline.a', 'lib/libhistory.a'] +
-              ['include/readline/%s' % x for x in ['chardefs.h', 'history.h', 'keymaps.h', 'readline.h', 'rlconf.h',
-                                                   'rlstdc.h', 'rltypedefs.h', 'tilde.h']],
-    'dirs' : [],
+    'files': ['lib/libreadline.a', 'lib/libhistory.a'] +
+             ['include/readline/%s' % x for x in ['chardefs.h', 'history.h', 'keymaps.h', 'readline.h', 'rlconf.h',
+                                                  'rlstdc.h', 'rltypedefs.h', 'tilde.h']],
+    'dirs': [],
 }
 
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgoolf-1.1.7.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgoolf-1.1.7.eb
index f943ccf7e0aed1bae0d11fb9ffba6495b6756389..7216c9ca1c0b1062947134f1b0e5a45aae88e03a 100644
--- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgoolf-1.1.7.eb
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgoolf-1.1.7.eb
@@ -21,10 +21,10 @@ dependencies = [('ncurses', '5.9-20130406')]
 preconfigopts = "LDFLAGS='-lncurses'"
 
 sanity_check_paths = {
-    'files' : ['lib/libreadline.a', 'lib/libhistory.a'] +
-              ['include/readline/%s' % x for x in ['chardefs.h', 'history.h', 'keymaps.h', 'readline.h', 'rlconf.h',
-                                                   'rlstdc.h', 'rltypedefs.h', 'tilde.h']],
-    'dirs' : [],
+    'files': ['lib/libreadline.a', 'lib/libhistory.a'] +
+             ['include/readline/%s' % x for x in ['chardefs.h', 'history.h', 'keymaps.h', 'readline.h', 'rlconf.h',
+                                                  'rlstdc.h', 'rltypedefs.h', 'tilde.h']],
+    'dirs': [],
 }
 
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gmpolf-1.4.8.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gmpolf-1.4.8.eb
index d504b4bb9d260334e0fe8de22b9d9a3eb6dcc5fe..a36ac06d7496201adeb72f7268a69c7caa5aaa53 100644
--- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gmpolf-1.4.8.eb
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gmpolf-1.4.8.eb
@@ -21,10 +21,10 @@ dependencies = [('ncurses', '5.9')]
 preconfigopts = "LDFLAGS='-lncurses'"
 
 sanity_check_paths = {
-    'files' : ['lib/libreadline.a', 'lib/libhistory.a'] +
-              ['include/readline/%s' % x for x in ['chardefs.h', 'history.h', 'keymaps.h', 'readline.h', 'rlconf.h',
-                                                   'rlstdc.h', 'rltypedefs.h', 'tilde.h']],
-    'dirs' : [],
+    'files': ['lib/libreadline.a', 'lib/libhistory.a'] +
+             ['include/readline/%s' % x for x in ['chardefs.h', 'history.h', 'keymaps.h', 'readline.h', 'rlconf.h',
+                                                  'rlstdc.h', 'rltypedefs.h', 'tilde.h']],
+    'dirs': [],
 }
 
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gmvolf-1.7.12.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gmvolf-1.7.12.eb
index 1c4ed7503785da31282cd0653ba3abe8f19155c0..44256963645070ebc9397f8f754f7a7c06e64003 100644
--- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gmvolf-1.7.12.eb
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gmvolf-1.7.12.eb
@@ -21,10 +21,10 @@ dependencies = [('ncurses', '5.9-20130406')]
 preconfigopts = "LDFLAGS='-lncurses'"
 
 sanity_check_paths = {
-    'files' : ['lib/libreadline.a', 'lib/libhistory.a'] +
-              ['include/readline/%s' % x for x in ['chardefs.h', 'history.h', 'keymaps.h', 'readline.h', 'rlconf.h',
-                                                   'rlstdc.h', 'rltypedefs.h', 'tilde.h']],
-    'dirs' : [],
+    'files': ['lib/libreadline.a', 'lib/libhistory.a'] +
+             ['include/readline/%s' % x for x in ['chardefs.h', 'history.h', 'keymaps.h', 'readline.h', 'rlconf.h',
+                                                  'rlstdc.h', 'rltypedefs.h', 'tilde.h']],
+    'dirs': [],
 }
 
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gmvolf-1.7.12rc1.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gmvolf-1.7.12rc1.eb
index 763615c3b80ae9dd9ee928e2f3e2d4c82baeed9d..8892dfc907e2ffe7fec8ea376d8bc81dd23d936a 100644
--- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gmvolf-1.7.12rc1.eb
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gmvolf-1.7.12rc1.eb
@@ -21,10 +21,10 @@ dependencies = [('ncurses', '5.9-20130406')]
 preconfigopts = "LDFLAGS='-lncurses'"
 
 sanity_check_paths = {
-    'files' : ['lib/libreadline.a', 'lib/libhistory.a'] +
-              ['include/readline/%s' % x for x in ['chardefs.h', 'history.h', 'keymaps.h', 'readline.h', 'rlconf.h',
-                                                   'rlstdc.h', 'rltypedefs.h', 'tilde.h']],
-    'dirs' : [],
+    'files': ['lib/libreadline.a', 'lib/libhistory.a'] +
+             ['include/readline/%s' % x for x in ['chardefs.h', 'history.h', 'keymaps.h', 'readline.h', 'rlconf.h',
+                                                  'rlstdc.h', 'rltypedefs.h', 'tilde.h']],
+    'dirs': [],
 }
 
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-goalf-1.1.0-no-OFED.eb
index 0a9aa5e42cc91a184c337e00fe756976087c9c1b..7778abffff5dda0354515b41f0432ed3a473929e 100644
--- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-goalf-1.1.0-no-OFED.eb
@@ -21,10 +21,10 @@ dependencies = [('ncurses', '5.9')]
 preconfigopts = "LDFLAGS='-lncurses'"
 
 sanity_check_paths = {
-    'files' : ['lib/libreadline.a', 'lib/libhistory.a'] +
-              ['include/readline/%s' % x for x in ['chardefs.h', 'history.h', 'keymaps.h', 'readline.h', 'rlconf.h',
-                                                   'rlstdc.h', 'rltypedefs.h', 'tilde.h']],
-    'dirs' : [],
+    'files': ['lib/libreadline.a', 'lib/libhistory.a'] +
+             ['include/readline/%s' % x for x in ['chardefs.h', 'history.h', 'keymaps.h', 'readline.h', 'rlconf.h',
+                                                  'rlstdc.h', 'rltypedefs.h', 'tilde.h']],
+    'dirs': [],
 }
 
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-goalf-1.5.12-no-OFED.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-goalf-1.5.12-no-OFED.eb
index 7f0acba39d6333a128ebdebf2a0517cc20f4d85b..157a15b6bbc87d4d5911bffeccfcdcbcca0a8598 100644
--- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-goalf-1.5.12-no-OFED.eb
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-goalf-1.5.12-no-OFED.eb
@@ -21,10 +21,10 @@ dependencies = [('ncurses', '5.9')]
 preconfigopts = "LDFLAGS='-lncurses'"
 
 sanity_check_paths = {
-    'files' : ['lib/libreadline.a', 'lib/libhistory.a'] +
-              ['include/readline/%s' % x for x in ['chardefs.h', 'history.h', 'keymaps.h', 'readline.h', 'rlconf.h',
-                                                   'rlstdc.h', 'rltypedefs.h', 'tilde.h']],
-    'dirs' : [],
+    'files': ['lib/libreadline.a', 'lib/libhistory.a'] +
+             ['include/readline/%s' % x for x in ['chardefs.h', 'history.h', 'keymaps.h', 'readline.h', 'rlconf.h',
+                                                  'rlstdc.h', 'rltypedefs.h', 'tilde.h']],
+    'dirs': [],
 }
 
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gompi-1.4.12-no-OFED.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gompi-1.4.12-no-OFED.eb
index 9d6b94d269cf4db1ac94a5f26e73a185a83f9fec..6a9bcf9cdd20df999f2d5d4e5eb7d9757f482b44 100644
--- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gompi-1.4.12-no-OFED.eb
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gompi-1.4.12-no-OFED.eb
@@ -21,10 +21,10 @@ dependencies = [('ncurses', '5.9')]
 preconfigopts = "LDFLAGS='-lncurses'"
 
 sanity_check_paths = {
-    'files' : ['lib/libreadline.a', 'lib/libhistory.a'] +
-              ['include/readline/%s' % x for x in ['chardefs.h', 'history.h', 'keymaps.h', 'readline.h', 'rlconf.h',
-                                                   'rlstdc.h', 'rltypedefs.h', 'tilde.h']],
-    'dirs' : [],
+    'files': ['lib/libreadline.a', 'lib/libhistory.a'] +
+             ['include/readline/%s' % x for x in ['chardefs.h', 'history.h', 'keymaps.h', 'readline.h', 'rlconf.h',
+                                                  'rlstdc.h', 'rltypedefs.h', 'tilde.h']],
+    'dirs': [],
 }
 
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-goolf-1.4.10.eb
index a2a91a97835ab079e3ca22bafa4bd32fd685c4e2..c5324cbad17bf175b5edf389d2d1137c3b7cd8d2 100644
--- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-goolf-1.4.10.eb
@@ -21,10 +21,10 @@ dependencies = [('ncurses', '5.9')]
 preconfigopts = "LDFLAGS='-lncurses'"
 
 sanity_check_paths = {
-    'files' : ['lib/libreadline.a', 'lib/libhistory.a'] +
-              ['include/readline/%s' % x for x in ['chardefs.h', 'history.h', 'keymaps.h', 'readline.h', 'rlconf.h',
-                                                   'rlstdc.h', 'rltypedefs.h', 'tilde.h']],
-    'dirs' : [],
+    'files': ['lib/libreadline.a', 'lib/libhistory.a'] +
+             ['include/readline/%s' % x for x in ['chardefs.h', 'history.h', 'keymaps.h', 'readline.h', 'rlconf.h',
+                                                  'rlstdc.h', 'rltypedefs.h', 'tilde.h']],
+    'dirs': [],
 }
 
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-goolf-1.5.14.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-goolf-1.5.14.eb
index 82d3bb3ea36b95a45307a78d3acca11c6eae7f19..b07b7634b9378a6e3cc51067addf0af43f2682f2 100644
--- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-goolf-1.5.14.eb
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-goolf-1.5.14.eb
@@ -21,10 +21,10 @@ dependencies = [('ncurses', '5.9')]
 preconfigopts = "LDFLAGS='-lncurses'"
 
 sanity_check_paths = {
-    'files' : ['lib/libreadline.a', 'lib/libhistory.a'] +
-              ['include/readline/%s' % x for x in ['chardefs.h', 'history.h', 'keymaps.h', 'readline.h', 'rlconf.h',
-                                                   'rlstdc.h', 'rltypedefs.h', 'tilde.h']],
-    'dirs' : [],
+    'files': ['lib/libreadline.a', 'lib/libhistory.a'] +
+             ['include/readline/%s' % x for x in ['chardefs.h', 'history.h', 'keymaps.h', 'readline.h', 'rlconf.h',
+                                                  'rlstdc.h', 'rltypedefs.h', 'tilde.h']],
+    'dirs': [],
 }
 
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-4.0.10.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-4.0.10.eb
index 0ea31c36445a67f24573f91cc69d57464380e8e5..853816b19b74252c39cd4f68750b6a32c459a7d2 100644
--- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-4.0.10.eb
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-4.0.10.eb
@@ -21,10 +21,10 @@ dependencies = [('ncurses', '5.9')]
 preconfigopts = "LDFLAGS='-lncurses'"
 
 sanity_check_paths = {
-    'files' : ['lib/libreadline.a', 'lib/libhistory.a'] +
-              ['include/readline/%s' % x for x in ['chardefs.h', 'history.h', 'keymaps.h', 'readline.h', 'rlconf.h',
-                                                   'rlstdc.h', 'rltypedefs.h', 'tilde.h']],
-    'dirs' : [],
+    'files': ['lib/libreadline.a', 'lib/libhistory.a'] +
+             ['include/readline/%s' % x for x in ['chardefs.h', 'history.h', 'keymaps.h', 'readline.h', 'rlconf.h',
+                                                  'rlstdc.h', 'rltypedefs.h', 'tilde.h']],
+    'dirs': [],
 }
 
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-4.0.6.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-4.0.6.eb
index d91a3d0cbdeac3d116cd3872055d25a28c78f598..26cadb84b9a2e811c060b66e5287914f7b23480c 100644
--- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-4.0.6.eb
@@ -21,10 +21,10 @@ dependencies = [('ncurses', '5.9')]
 preconfigopts = "LDFLAGS='-lncurses'"
 
 sanity_check_paths = {
-    'files' : ['lib/libreadline.a', 'lib/libhistory.a'] +
-              ['include/readline/%s' % x for x in ['chardefs.h', 'history.h', 'keymaps.h', 'readline.h', 'rlconf.h',
-                                                   'rlstdc.h', 'rltypedefs.h', 'tilde.h']],
-    'dirs' : [],
+    'files': ['lib/libreadline.a', 'lib/libhistory.a'] +
+             ['include/readline/%s' % x for x in ['chardefs.h', 'history.h', 'keymaps.h', 'readline.h', 'rlconf.h',
+                                                  'rlstdc.h', 'rltypedefs.h', 'tilde.h']],
+    'dirs': [],
 }
 
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-4.1.13.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-4.1.13.eb
index 85c94bcdf611c927d5a818fdb9db6afd8fdaeeee..055d457da0daf5dcb7f56dcfe9ea760607859dbd 100644
--- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-4.1.13.eb
@@ -21,10 +21,10 @@ dependencies = [('ncurses', '5.9')]
 preconfigopts = "LDFLAGS='-lncurses'"
 
 sanity_check_paths = {
-    'files' : ['lib/libreadline.a', 'lib/libhistory.a'] +
-              ['include/readline/%s' % x for x in ['chardefs.h', 'history.h', 'keymaps.h', 'readline.h', 'rlconf.h',
-                                                   'rlstdc.h', 'rltypedefs.h', 'tilde.h']],
-    'dirs' : [],
+    'files': ['lib/libreadline.a', 'lib/libhistory.a'] +
+             ['include/readline/%s' % x for x in ['chardefs.h', 'history.h', 'keymaps.h', 'readline.h', 'rlconf.h',
+                                                  'rlstdc.h', 'rltypedefs.h', 'tilde.h']],
+    'dirs': [],
 }
 
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-5.2.0.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-5.2.0.eb
index 7b606618cdb8f0e3bc8c45337f3c35072df76e6a..6f9a153abf6d4091831d18e02db1b0a2cc1ed77b 100644
--- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-5.2.0.eb
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-5.2.0.eb
@@ -9,7 +9,7 @@ allow users to edit command lines as they are typed in. Both Emacs and vi editin
 The Readline library includes additional functions to maintain a list of previously-entered command lines,
 to recall and perhaps reedit those lines, and perform csh-like history expansion on previous commands."""
 
-toolchain = {'name': 'ictce', 'version' : '5.2.0'}
+toolchain = {'name': 'ictce', 'version': '5.2.0'}
 toolchainopts = {'pic': True}
 
 sources = ['readline-%(version)s.tar.gz']
@@ -21,10 +21,10 @@ dependencies = [('ncurses', '5.9')]
 preconfigopts = "LDFLAGS='-lncurses'"
 
 sanity_check_paths = {
-    'files' : ['lib/libreadline.a', 'lib/libhistory.a'] +
-              ['include/readline/%s' % x for x in ['chardefs.h', 'history.h', 'keymaps.h', 'readline.h', 'rlconf.h',
-                                                   'rlstdc.h', 'rltypedefs.h', 'tilde.h']],
-    'dirs' : [],
+    'files': ['lib/libreadline.a', 'lib/libhistory.a'] +
+             ['include/readline/%s' % x for x in ['chardefs.h', 'history.h', 'keymaps.h', 'readline.h', 'rlconf.h',
+                                                  'rlstdc.h', 'rltypedefs.h', 'tilde.h']],
+    'dirs': [],
 }
 
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-5.3.0.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-5.3.0.eb
index 569becdb9b6b11ca9eba206f9b0d64f11ce20f76..a4bce470a581a429d2db91ccbd4dfb427d16ecc2 100644
--- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-5.3.0.eb
@@ -21,10 +21,10 @@ dependencies = [('ncurses', '5.9')]
 preconfigopts = "LDFLAGS='-lncurses'"
 
 sanity_check_paths = {
-    'files' : ['lib/libreadline.a', 'lib/libhistory.a'] +
-              ['include/readline/%s' % x for x in ['chardefs.h', 'history.h', 'keymaps.h', 'readline.h', 'rlconf.h',
-                                                   'rlstdc.h', 'rltypedefs.h', 'tilde.h']],
-    'dirs' : [],
+    'files': ['lib/libreadline.a', 'lib/libhistory.a'] +
+             ['include/readline/%s' % x for x in ['chardefs.h', 'history.h', 'keymaps.h', 'readline.h', 'rlconf.h',
+                                                  'rlstdc.h', 'rltypedefs.h', 'tilde.h']],
+    'dirs': [],
 }
 
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-5.4.0.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-5.4.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..8003f03676c67211eddf93fa2cfb6f4fa325002c
--- /dev/null
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-5.4.0.eb
@@ -0,0 +1,30 @@
+easyblock = 'ConfigureMake'
+
+name = 'libreadline'
+version = '6.2'
+
+homepage = 'http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html'
+description = """The GNU Readline library provides a set of functions for use by applications that
+ allow users to edit command lines as they are typed in. Both Emacs and vi editing modes are available.
+ The Readline library includes additional functions to maintain a list of previously-entered command lines,
+ to recall and perhaps reedit those lines, and perform csh-like history expansion on previous commands."""
+
+toolchain = {'name': 'ictce', 'version': '5.4.0'}
+toolchainopts = {'pic': True}
+
+sources = ['readline-%(version)s.tar.gz']
+source_urls = ['http://ftp.gnu.org/gnu/readline']
+
+dependencies = [('ncurses', '5.9')]
+
+# for the termcap symbols, use EB ncurses
+preconfigopts = "LDFLAGS='-lncurses'"
+
+sanity_check_paths = {
+    'files' : ['lib/libreadline.a', 'lib/libhistory.a'] +
+              ['include/readline/%s' % x for x in ['chardefs.h', 'history.h', 'keymaps.h', 'readline.h', 'rlconf.h',
+                                                   'rlstdc.h', 'rltypedefs.h', 'tilde.h']],
+    'dirs' : [],
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-5.5.0.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-5.5.0.eb
index c0482afd8005dd6c7d3a576e83927837b295679b..15a227218e589f36cad4c80cfe1033487c5775a9 100644
--- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-5.5.0.eb
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-5.5.0.eb
@@ -21,10 +21,10 @@ dependencies = [('ncurses', '5.9')]
 preconfigopts = "LDFLAGS='-lncurses'"
 
 sanity_check_paths = {
-    'files' : ['lib/libreadline.a', 'lib/libhistory.a'] +
-              ['include/readline/%s' % x for x in ['chardefs.h', 'history.h', 'keymaps.h', 'readline.h', 'rlconf.h',
-                                                   'rlstdc.h', 'rltypedefs.h', 'tilde.h']],
-    'dirs' : [],
+    'files': ['lib/libreadline.a', 'lib/libhistory.a'] +
+             ['include/readline/%s' % x for x in ['chardefs.h', 'history.h', 'keymaps.h', 'readline.h', 'rlconf.h',
+                                                  'rlstdc.h', 'rltypedefs.h', 'tilde.h']],
+    'dirs': [],
 }
 
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-intel-2015a.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-intel-2015a.eb
index d963e36805f569579a0e694759075834e597ec67..9236fd84d0e29a2f4e2c0d827be11f8afe2eed1e 100644
--- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-intel-2015a.eb
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-intel-2015a.eb
@@ -21,10 +21,10 @@ dependencies = [('ncurses', '5.9')]
 preconfigopts = "LDFLAGS='-lncurses'"
 
 sanity_check_paths = {
-    'files' : ['lib/libreadline.a', 'lib/libhistory.a'] +
-              ['include/readline/%s' % x for x in ['chardefs.h', 'history.h', 'keymaps.h', 'readline.h', 'rlconf.h',
-                                                   'rlstdc.h', 'rltypedefs.h', 'tilde.h']],
-    'dirs' : [],
+    'files': ['lib/libreadline.a', 'lib/libhistory.a'] +
+             ['include/readline/%s' % x for x in ['chardefs.h', 'history.h', 'keymaps.h', 'readline.h', 'rlconf.h',
+                                                  'rlstdc.h', 'rltypedefs.h', 'tilde.h']],
+    'dirs': [],
 }
 
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-iomkl-4.6.13.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-iomkl-4.6.13.eb
index 9554501c1932495ae653233b4733e363a2865ad2..7435fb5029668831e02b53a1b22fe8729a85e617 100644
--- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-iomkl-4.6.13.eb
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-iomkl-4.6.13.eb
@@ -21,10 +21,10 @@ dependencies = [('ncurses', '5.9')]
 preconfigopts = "LDFLAGS='-lncurses'"
 
 sanity_check_paths = {
-    'files' : ['lib/libreadline.a', 'lib/libhistory.a'] +
-              ['include/readline/%s' % x for x in ['chardefs.h', 'history.h', 'keymaps.h', 'readline.h', 'rlconf.h',
-                                                   'rlstdc.h', 'rltypedefs.h', 'tilde.h']],
-    'dirs' : [],
+    'files': ['lib/libreadline.a', 'lib/libhistory.a'] +
+             ['include/readline/%s' % x for x in ['chardefs.h', 'history.h', 'keymaps.h', 'readline.h', 'rlconf.h',
+                                                  'rlstdc.h', 'rltypedefs.h', 'tilde.h']],
+    'dirs': [],
 }
 
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-iqacml-3.7.3.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-iqacml-3.7.3.eb
index e5a19f2764c06a4b8d6d9849a89f424c823d44a4..a669b4f5be98d4f4d08ca6e5f4b73cc1d3cf987e 100644
--- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-iqacml-3.7.3.eb
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-iqacml-3.7.3.eb
@@ -21,10 +21,10 @@ dependencies = [('ncurses', '5.9')]
 preconfigopts = "LDFLAGS='-lncurses'"
 
 sanity_check_paths = {
-    'files' : ['lib/libreadline.a', 'lib/libhistory.a'] +
-              ['include/readline/%s' % x for x in ['chardefs.h', 'history.h', 'keymaps.h', 'readline.h', 'rlconf.h',
-                                                   'rlstdc.h', 'rltypedefs.h', 'tilde.h']],
-    'dirs' : [],
+    'files': ['lib/libreadline.a', 'lib/libhistory.a'] +
+             ['include/readline/%s' % x for x in ['chardefs.h', 'history.h', 'keymaps.h', 'readline.h', 'rlconf.h',
+                                                  'rlstdc.h', 'rltypedefs.h', 'tilde.h']],
+    'dirs': [],
 }
 
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-iqacml-4.4.13.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-iqacml-4.4.13.eb
index 6c11c363a65dfceebb428bc9e2722c9e7c544f7e..a120dd43072133e15932f1ecc39c22507677fd92 100644
--- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-iqacml-4.4.13.eb
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-iqacml-4.4.13.eb
@@ -21,10 +21,10 @@ dependencies = [('ncurses', '5.9')]
 preconfigopts = "LDFLAGS='-lncurses'"
 
 sanity_check_paths = {
-    'files' : ['lib/libreadline.a', 'lib/libhistory.a'] +
-              ['include/readline/%s' % x for x in ['chardefs.h', 'history.h', 'keymaps.h', 'readline.h', 'rlconf.h',
-                                                   'rlstdc.h', 'rltypedefs.h', 'tilde.h']],
-    'dirs' : [],
+    'files': ['lib/libreadline.a', 'lib/libhistory.a'] +
+             ['include/readline/%s' % x for x in ['chardefs.h', 'history.h', 'keymaps.h', 'readline.h', 'rlconf.h',
+                                                  'rlstdc.h', 'rltypedefs.h', 'tilde.h']],
+    'dirs': [],
 }
 
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.3-GCC-4.8.2.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.3-GCC-4.8.2.eb
index c91b6b94701ad1d2c0bb8e49b2052552597182d7..252a86c5272777c1e73cb40a1b2157a44f522ec0 100644
--- a/easybuild/easyconfigs/l/libreadline/libreadline-6.3-GCC-4.8.2.eb
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.3-GCC-4.8.2.eb
@@ -20,10 +20,10 @@ dependencies = [('ncurses', '5.9')]
 preconfigopts = "LDFLAGS='-lncurses'"
 
 sanity_check_paths = {
-    'files' : ['lib/libreadline.a', 'lib/libhistory.a'] +
-              ['include/readline/%s' % x for x in ['chardefs.h', 'history.h', 'keymaps.h', 'readline.h', 'rlconf.h',
-                                                   'rlstdc.h', 'rltypedefs.h', 'tilde.h']],
-    'dirs' : [],
+    'files': ['lib/libreadline.a', 'lib/libhistory.a'] +
+             ['include/readline/%s' % x for x in ['chardefs.h', 'history.h', 'keymaps.h', 'readline.h', 'rlconf.h',
+                                                  'rlstdc.h', 'rltypedefs.h', 'tilde.h']],
+    'dirs': [],
 }
 
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.3-GCC-4.9.2.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.3-GCC-4.9.2.eb
index 10721a76588cc69e39798185f01804b989179cd3..afd0f9f313dd4937045b4ab3c5509f01bca1ba7b 100644
--- a/easybuild/easyconfigs/l/libreadline/libreadline-6.3-GCC-4.9.2.eb
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.3-GCC-4.9.2.eb
@@ -21,10 +21,10 @@ dependencies = [('ncurses', '5.9')]
 preconfigopts = "LDFLAGS='-lncurses'"
 
 sanity_check_paths = {
-    'files' : ['lib/libreadline.a', 'lib/libhistory.a'] +
-              ['include/readline/%s' % x for x in ['chardefs.h', 'history.h', 'keymaps.h', 'readline.h', 'rlconf.h',
-                                                   'rlstdc.h', 'rltypedefs.h', 'tilde.h']],
-    'dirs' : [],
+    'files': ['lib/libreadline.a', 'lib/libhistory.a'] +
+             ['include/readline/%s' % x for x in ['chardefs.h', 'history.h', 'keymaps.h', 'readline.h', 'rlconf.h',
+                                                  'rlstdc.h', 'rltypedefs.h', 'tilde.h']],
+    'dirs': [],
 }
 
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.3-GCCcore-4.9.3.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.3-GCCcore-4.9.3.eb
index 3c101707a6e69abe030dc75727769ea039a52c6b..46e89b5a9631cb5358043e3ac5817d97f33b546b 100644
--- a/easybuild/easyconfigs/l/libreadline/libreadline-6.3-GCCcore-4.9.3.eb
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.3-GCCcore-4.9.3.eb
@@ -24,7 +24,7 @@ preconfigopts = "LDFLAGS='-lncurses'"
 sanity_check_paths = {
     'files': ['lib/libreadline.a', 'lib/libhistory.a'] +
              ['include/readline/%s' % x for x in ['chardefs.h', 'history.h', 'keymaps.h', 'readline.h', 'rlconf.h',
-                                                   'rlstdc.h', 'rltypedefs.h', 'tilde.h']],
+                                                  'rlstdc.h', 'rltypedefs.h', 'tilde.h']],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.3-GNU-4.9.3-2.25.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.3-GNU-4.9.3-2.25.eb
index c63d31b97cf1d56ec92510109fbae33363346e53..05d84769350f732f669f87267245163622ce84c2 100644
--- a/easybuild/easyconfigs/l/libreadline/libreadline-6.3-GNU-4.9.3-2.25.eb
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.3-GNU-4.9.3-2.25.eb
@@ -21,10 +21,10 @@ dependencies = [('ncurses', '5.9')]
 preconfigopts = "LDFLAGS='-lncurses'"
 
 sanity_check_paths = {
-    'files' : ['lib/libreadline.a', 'lib/libhistory.a'] +
-              ['include/readline/%s' % x for x in ['chardefs.h', 'history.h', 'keymaps.h', 'readline.h', 'rlconf.h',
-                                                   'rlstdc.h', 'rltypedefs.h', 'tilde.h']],
-    'dirs' : [],
+    'files': ['lib/libreadline.a', 'lib/libhistory.a'] +
+             ['include/readline/%s' % x for x in ['chardefs.h', 'history.h', 'keymaps.h', 'readline.h', 'rlconf.h',
+                                                  'rlstdc.h', 'rltypedefs.h', 'tilde.h']],
+    'dirs': [],
 }
 
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.3-foss-2014b.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.3-foss-2014b.eb
index 8b18b445d2207cd51d55099d61b480c07204900c..362df4f9bdb1c527421254122e94a0d4d0d33f98 100644
--- a/easybuild/easyconfigs/l/libreadline/libreadline-6.3-foss-2014b.eb
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.3-foss-2014b.eb
@@ -21,10 +21,10 @@ dependencies = [('ncurses', '5.9')]
 preconfigopts = "LDFLAGS='-lncurses'"
 
 sanity_check_paths = {
-    'files' : ['lib/libreadline.a', 'lib/libhistory.a'] +
-              ['include/readline/%s' % x for x in ['chardefs.h', 'history.h', 'keymaps.h', 'readline.h', 'rlconf.h',
-                                                   'rlstdc.h', 'rltypedefs.h', 'tilde.h']],
-    'dirs' : [],
+    'files': ['lib/libreadline.a', 'lib/libhistory.a'] +
+             ['include/readline/%s' % x for x in ['chardefs.h', 'history.h', 'keymaps.h', 'readline.h', 'rlconf.h',
+                                                  'rlstdc.h', 'rltypedefs.h', 'tilde.h']],
+    'dirs': [],
 }
 
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.3-foss-2015.05.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.3-foss-2015.05.eb
index 8985f04b52d215ec9539e3a86d5519a8f3f9dfbc..763ccd948895bc5c2f4a8bf79edce3ed7bcbc06a 100644
--- a/easybuild/easyconfigs/l/libreadline/libreadline-6.3-foss-2015.05.eb
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.3-foss-2015.05.eb
@@ -21,10 +21,10 @@ dependencies = [('ncurses', '5.9')]
 preconfigopts = "LDFLAGS='-lncurses'"
 
 sanity_check_paths = {
-    'files' : ['lib/libreadline.a', 'lib/libhistory.a'] +
-              ['include/readline/%s' % x for x in ['chardefs.h', 'history.h', 'keymaps.h', 'readline.h', 'rlconf.h',
-                                                   'rlstdc.h', 'rltypedefs.h', 'tilde.h']],
-    'dirs' : [],
+    'files': ['lib/libreadline.a', 'lib/libhistory.a'] +
+             ['include/readline/%s' % x for x in ['chardefs.h', 'history.h', 'keymaps.h', 'readline.h', 'rlconf.h',
+                                                  'rlstdc.h', 'rltypedefs.h', 'tilde.h']],
+    'dirs': [],
 }
 
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.3-foss-2015a.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.3-foss-2015a.eb
index 505614848ebbd4d4fb93c0961bbfbd48d69816a4..d3b76459b6d44c14213c55fcfe4732b0a9f6881d 100644
--- a/easybuild/easyconfigs/l/libreadline/libreadline-6.3-foss-2015a.eb
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.3-foss-2015a.eb
@@ -21,10 +21,10 @@ dependencies = [('ncurses', '5.9')]
 preconfigopts = "LDFLAGS='-lncurses'"
 
 sanity_check_paths = {
-    'files' : ['lib/libreadline.a', 'lib/libhistory.a'] +
-              ['include/readline/%s' % x for x in ['chardefs.h', 'history.h', 'keymaps.h', 'readline.h', 'rlconf.h',
-                                                   'rlstdc.h', 'rltypedefs.h', 'tilde.h']],
-    'dirs' : [],
+    'files': ['lib/libreadline.a', 'lib/libhistory.a'] +
+             ['include/readline/%s' % x for x in ['chardefs.h', 'history.h', 'keymaps.h', 'readline.h', 'rlconf.h',
+                                                  'rlstdc.h', 'rltypedefs.h', 'tilde.h']],
+    'dirs': [],
 }
 
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.3-foss-2015b.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.3-foss-2015b.eb
index 12cfef1cc3cdd1fe0dd739d5b178fcf316cbff91..66ecad79ff5cb8aab4c9881ac3b3b40065bbe447 100644
--- a/easybuild/easyconfigs/l/libreadline/libreadline-6.3-foss-2015b.eb
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.3-foss-2015b.eb
@@ -21,10 +21,10 @@ dependencies = [('ncurses', '5.9')]
 preconfigopts = "LDFLAGS='-lncurses'"
 
 sanity_check_paths = {
-    'files' : ['lib/libreadline.a', 'lib/libhistory.a'] +
-              ['include/readline/%s' % x for x in ['chardefs.h', 'history.h', 'keymaps.h', 'readline.h', 'rlconf.h',
-                                                   'rlstdc.h', 'rltypedefs.h', 'tilde.h']],
-    'dirs' : [],
+    'files': ['lib/libreadline.a', 'lib/libhistory.a'] +
+             ['include/readline/%s' % x for x in ['chardefs.h', 'history.h', 'keymaps.h', 'readline.h', 'rlconf.h',
+                                                  'rlstdc.h', 'rltypedefs.h', 'tilde.h']],
+    'dirs': [],
 }
 
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.3-foss-2016a.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.3-foss-2016a.eb
index 4d15c99139f4eb76a0b9de8678b640960f4bd348..037141ab778ea9d9405bc2774f34d54c103c75f3 100644
--- a/easybuild/easyconfigs/l/libreadline/libreadline-6.3-foss-2016a.eb
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.3-foss-2016a.eb
@@ -21,10 +21,10 @@ dependencies = [('ncurses', '6.0')]
 preconfigopts = "LDFLAGS='-lncurses'"
 
 sanity_check_paths = {
-    'files' : ['lib/libreadline.a', 'lib/libhistory.a'] +
-              ['include/readline/%s' % x for x in ['chardefs.h', 'history.h', 'keymaps.h', 'readline.h', 'rlconf.h',
-                                                   'rlstdc.h', 'rltypedefs.h', 'tilde.h']],
-    'dirs' : [],
+    'files': ['lib/libreadline.a', 'lib/libhistory.a'] +
+             ['include/readline/%s' % x for x in ['chardefs.h', 'history.h', 'keymaps.h', 'readline.h', 'rlconf.h',
+                                                  'rlstdc.h', 'rltypedefs.h', 'tilde.h']],
+    'dirs': [],
 }
 
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.3-gimkl-2.11.5.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.3-gimkl-2.11.5.eb
index 7eea47c4c649d50f87aa98f84e11692ac9750a42..fb2145ca857437d4442fcb075c14d247c0a96c58 100644
--- a/easybuild/easyconfigs/l/libreadline/libreadline-6.3-gimkl-2.11.5.eb
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.3-gimkl-2.11.5.eb
@@ -21,10 +21,10 @@ dependencies = [('ncurses', '5.9')]
 preconfigopts = "LDFLAGS='-lncurses'"
 
 sanity_check_paths = {
-    'files' : ['lib/libreadline.a', 'lib/libhistory.a'] +
-              ['include/readline/%s' % x for x in ['chardefs.h', 'history.h', 'keymaps.h', 'readline.h', 'rlconf.h',
-                                                   'rlstdc.h', 'rltypedefs.h', 'tilde.h']],
-    'dirs' : [],
+    'files': ['lib/libreadline.a', 'lib/libhistory.a'] +
+             ['include/readline/%s' % x for x in ['chardefs.h', 'history.h', 'keymaps.h', 'readline.h', 'rlconf.h',
+                                                  'rlstdc.h', 'rltypedefs.h', 'tilde.h']],
+    'dirs': [],
 }
 
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.3-gompi-1.5.16.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.3-gompi-1.5.16.eb
index 77b77c5ab34618778edd1046ab9af7f9b2b4d19c..8845b7c009d1113640f85777f69d7906534f8b77 100644
--- a/easybuild/easyconfigs/l/libreadline/libreadline-6.3-gompi-1.5.16.eb
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.3-gompi-1.5.16.eb
@@ -21,10 +21,10 @@ dependencies = [('ncurses', '5.9')]
 preconfigopts = "LDFLAGS='-lncurses'"
 
 sanity_check_paths = {
-    'files' : ['lib/libreadline.a', 'lib/libhistory.a'] +
-              ['include/readline/%s' % x for x in ['chardefs.h', 'history.h', 'keymaps.h', 'readline.h', 'rlconf.h',
-                                                   'rlstdc.h', 'rltypedefs.h', 'tilde.h']],
-    'dirs' : [],
+    'files': ['lib/libreadline.a', 'lib/libhistory.a'] +
+             ['include/readline/%s' % x for x in ['chardefs.h', 'history.h', 'keymaps.h', 'readline.h', 'rlconf.h',
+                                                  'rlstdc.h', 'rltypedefs.h', 'tilde.h']],
+    'dirs': [],
 }
 
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.3-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.3-goolf-1.4.10.eb
index a703a43f652db2496efb6a8cbc1806caaba10f84..793dcaf0af9d518ec1a17da92d992c39914f9853 100644
--- a/easybuild/easyconfigs/l/libreadline/libreadline-6.3-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.3-goolf-1.4.10.eb
@@ -21,10 +21,10 @@ dependencies = [('ncurses', '5.9')]
 preconfigopts = "LDFLAGS='-lncurses'"
 
 sanity_check_paths = {
-    'files' : ['lib/libreadline.a', 'lib/libhistory.a'] +
-              ['include/readline/%s' % x for x in ['chardefs.h', 'history.h', 'keymaps.h', 'readline.h', 'rlconf.h',
-                                                   'rlstdc.h', 'rltypedefs.h', 'tilde.h']],
-    'dirs' : [],
+    'files': ['lib/libreadline.a', 'lib/libhistory.a'] +
+             ['include/readline/%s' % x for x in ['chardefs.h', 'history.h', 'keymaps.h', 'readline.h', 'rlconf.h',
+                                                  'rlstdc.h', 'rltypedefs.h', 'tilde.h']],
+    'dirs': [],
 }
 
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.3-goolf-1.5.14.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.3-goolf-1.5.14.eb
index 3b29814b1f6e51f83f16455e821ecf75258f3d90..e594babc962286447e5cf8a60625ed8d96ad63e6 100644
--- a/easybuild/easyconfigs/l/libreadline/libreadline-6.3-goolf-1.5.14.eb
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.3-goolf-1.5.14.eb
@@ -21,10 +21,10 @@ dependencies = [('ncurses', '5.9')]
 preconfigopts = "LDFLAGS='-lncurses'"
 
 sanity_check_paths = {
-    'files' : ['lib/libreadline.a', 'lib/libhistory.a'] +
-              ['include/readline/%s' % x for x in ['chardefs.h', 'history.h', 'keymaps.h', 'readline.h', 'rlconf.h',
-                                                   'rlstdc.h', 'rltypedefs.h', 'tilde.h']],
-    'dirs' : [],
+    'files': ['lib/libreadline.a', 'lib/libhistory.a'] +
+             ['include/readline/%s' % x for x in ['chardefs.h', 'history.h', 'keymaps.h', 'readline.h', 'rlconf.h',
+                                                  'rlstdc.h', 'rltypedefs.h', 'tilde.h']],
+    'dirs': [],
 }
 
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.3-goolf-1.7.20.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.3-goolf-1.7.20.eb
index 1b6851f0cd04fc79be43f6ace7c24d3c44d47733..ec5413615c6946b0b1f010599aaa86f039b41fbb 100644
--- a/easybuild/easyconfigs/l/libreadline/libreadline-6.3-goolf-1.7.20.eb
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.3-goolf-1.7.20.eb
@@ -21,10 +21,10 @@ dependencies = [('ncurses', '5.9')]
 preconfigopts = "LDFLAGS='-lncurses'"
 
 sanity_check_paths = {
-    'files' : ['lib/libreadline.a', 'lib/libhistory.a'] +
-              ['include/readline/%s' % x for x in ['chardefs.h', 'history.h', 'keymaps.h', 'readline.h', 'rlconf.h',
-                                                   'rlstdc.h', 'rltypedefs.h', 'tilde.h']],
-    'dirs' : [],
+    'files': ['lib/libreadline.a', 'lib/libhistory.a'] +
+             ['include/readline/%s' % x for x in ['chardefs.h', 'history.h', 'keymaps.h', 'readline.h', 'rlconf.h',
+                                                  'rlstdc.h', 'rltypedefs.h', 'tilde.h']],
+    'dirs': [],
 }
 
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.3-ictce-6.2.5.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.3-ictce-6.2.5.eb
index bf05a3f8b5abb317ea3ce0a6ef77a1c3308c6f8e..35af50be83bdce6ffaf60f2c5bea696c9622cd54 100644
--- a/easybuild/easyconfigs/l/libreadline/libreadline-6.3-ictce-6.2.5.eb
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.3-ictce-6.2.5.eb
@@ -24,9 +24,8 @@ preconfigopts = "LDFLAGS='-lncurses'"
 
 sanity_check_paths = {
     'files': ['lib/libreadline.a', 'lib/libhistory.a'] +
-             ['include/readline/%s' % x for x in
-                 ['chardefs.h', 'history.h', 'keymaps.h', 'readline.h',
-                 'rlconf.h', 'rlstdc.h', 'rltypedefs.h', 'tilde.h']],
+             ['include/readline/%s' % x for x in ['chardefs.h', 'history.h', 'keymaps.h', 'readline.h', 'rlconf.h',
+                                                  'rlstdc.h', 'rltypedefs.h', 'tilde.h']],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.3-ictce-6.3.5.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.3-ictce-6.3.5.eb
index ae449f5493d59c25183756afdaaad7d5faf671e8..2db2e8532677fee8a12e72fd49e4541825180391 100644
--- a/easybuild/easyconfigs/l/libreadline/libreadline-6.3-ictce-6.3.5.eb
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.3-ictce-6.3.5.eb
@@ -24,9 +24,8 @@ preconfigopts = "LDFLAGS='-lncurses'"
 
 sanity_check_paths = {
     'files': ['lib/libreadline.a', 'lib/libhistory.a'] +
-             ['include/readline/%s' % x for x in
-                 ['chardefs.h', 'history.h', 'keymaps.h', 'readline.h',
-                 'rlconf.h', 'rlstdc.h', 'rltypedefs.h', 'tilde.h']],
+             ['include/readline/%s' % x for x in ['chardefs.h', 'history.h', 'keymaps.h', 'readline.h', 'rlconf.h',
+                                                  'rlstdc.h', 'rltypedefs.h', 'tilde.h']],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.3-ictce-7.1.2.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.3-ictce-7.1.2.eb
index c0c7a99d1b49b8bf75692365adc6c822a1b82f9e..c9c675d48425bc1729e581c730a89ce19f78a154 100644
--- a/easybuild/easyconfigs/l/libreadline/libreadline-6.3-ictce-7.1.2.eb
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.3-ictce-7.1.2.eb
@@ -21,10 +21,10 @@ dependencies = [('ncurses', '5.9')]
 preconfigopts = "LDFLAGS='-lncurses'"
 
 sanity_check_paths = {
-    'files' : ['lib/libreadline.a', 'lib/libhistory.a'] +
-              ['include/readline/%s' % x for x in ['chardefs.h', 'history.h', 'keymaps.h', 'readline.h', 'rlconf.h',
-                                                   'rlstdc.h', 'rltypedefs.h', 'tilde.h']],
-    'dirs' : [],
+    'files': ['lib/libreadline.a', 'lib/libhistory.a'] +
+             ['include/readline/%s' % x for x in ['chardefs.h', 'history.h', 'keymaps.h', 'readline.h', 'rlconf.h',
+                                                  'rlstdc.h', 'rltypedefs.h', 'tilde.h']],
+    'dirs': [],
 }
 
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.3-ictce-7.3.5.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.3-ictce-7.3.5.eb
index aba2f0784123527d3ecebc5c384472984f856599..46eef59b197a2643bcfa3c8e4b06bb4703163b2e 100644
--- a/easybuild/easyconfigs/l/libreadline/libreadline-6.3-ictce-7.3.5.eb
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.3-ictce-7.3.5.eb
@@ -21,10 +21,10 @@ dependencies = [('ncurses', '5.9')]
 preconfigopts = "LDFLAGS='-lncurses'"
 
 sanity_check_paths = {
-    'files' : ['lib/libreadline.a', 'lib/libhistory.a'] +
-              ['include/readline/%s' % x for x in ['chardefs.h', 'history.h', 'keymaps.h', 'readline.h', 'rlconf.h',
-                                                   'rlstdc.h', 'rltypedefs.h', 'tilde.h']],
-    'dirs' : [],
+    'files': ['lib/libreadline.a', 'lib/libhistory.a'] +
+             ['include/readline/%s' % x for x in ['chardefs.h', 'history.h', 'keymaps.h', 'readline.h', 'rlconf.h',
+                                                  'rlstdc.h', 'rltypedefs.h', 'tilde.h']],
+    'dirs': [],
 }
 
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.3-intel-2014.06.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.3-intel-2014.06.eb
index 0c39d000e3b459dd63a12dcbcad921728aa57a11..583b41298f853b2d02f64efe757f7033b71c9f1a 100644
--- a/easybuild/easyconfigs/l/libreadline/libreadline-6.3-intel-2014.06.eb
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.3-intel-2014.06.eb
@@ -21,10 +21,10 @@ dependencies = [('ncurses', '5.9')]
 preconfigopts = "LDFLAGS='-lncurses'"
 
 sanity_check_paths = {
-    'files' : ['lib/libreadline.a', 'lib/libhistory.a'] +
-              ['include/readline/%s' % x for x in ['chardefs.h', 'history.h', 'keymaps.h', 'readline.h', 'rlconf.h',
-                                                   'rlstdc.h', 'rltypedefs.h', 'tilde.h']],
-    'dirs' : [],
+    'files': ['lib/libreadline.a', 'lib/libhistory.a'] +
+             ['include/readline/%s' % x for x in ['chardefs.h', 'history.h', 'keymaps.h', 'readline.h', 'rlconf.h',
+                                                  'rlstdc.h', 'rltypedefs.h', 'tilde.h']],
+    'dirs': [],
 }
 
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.3-intel-2014b.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.3-intel-2014b.eb
index 009d1d8c22de13daf1d226fdeedc371a4d801d58..3e67c2044917732df64cd7683b7c69cb103687ce 100644
--- a/easybuild/easyconfigs/l/libreadline/libreadline-6.3-intel-2014b.eb
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.3-intel-2014b.eb
@@ -21,10 +21,10 @@ dependencies = [('ncurses', '5.9')]
 preconfigopts = "LDFLAGS='-lncurses'"
 
 sanity_check_paths = {
-    'files' : ['lib/libreadline.a', 'lib/libhistory.a'] +
-              ['include/readline/%s' % x for x in ['chardefs.h', 'history.h', 'keymaps.h', 'readline.h', 'rlconf.h',
-                                                   'rlstdc.h', 'rltypedefs.h', 'tilde.h']],
-    'dirs' : [],
+    'files': ['lib/libreadline.a', 'lib/libhistory.a'] +
+             ['include/readline/%s' % x for x in ['chardefs.h', 'history.h', 'keymaps.h', 'readline.h', 'rlconf.h',
+                                                  'rlstdc.h', 'rltypedefs.h', 'tilde.h']],
+    'dirs': [],
 }
 
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.3-intel-2015a.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.3-intel-2015a.eb
index dcae291ca2ebbf5ef981020c015e0eabd4842e1a..2c8752c40012c517201fbbcb8e10906ff544e252 100644
--- a/easybuild/easyconfigs/l/libreadline/libreadline-6.3-intel-2015a.eb
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.3-intel-2015a.eb
@@ -21,10 +21,10 @@ dependencies = [('ncurses', '5.9')]
 preconfigopts = "LDFLAGS='-lncurses'"
 
 sanity_check_paths = {
-    'files' : ['lib/libreadline.a', 'lib/libhistory.a'] +
-              ['include/readline/%s' % x for x in ['chardefs.h', 'history.h', 'keymaps.h', 'readline.h', 'rlconf.h',
-                                                   'rlstdc.h', 'rltypedefs.h', 'tilde.h']],
-    'dirs' : [],
+    'files': ['lib/libreadline.a', 'lib/libhistory.a'] +
+             ['include/readline/%s' % x for x in ['chardefs.h', 'history.h', 'keymaps.h', 'readline.h', 'rlconf.h',
+                                                  'rlstdc.h', 'rltypedefs.h', 'tilde.h']],
+    'dirs': [],
 }
 
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.3-intel-2015b.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.3-intel-2015b.eb
index 631e51d64801b756997ff821d432e0f80c3cfe68..de76493eec8f84523ea05be91cf16de0d76741fe 100644
--- a/easybuild/easyconfigs/l/libreadline/libreadline-6.3-intel-2015b.eb
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.3-intel-2015b.eb
@@ -21,10 +21,10 @@ dependencies = [('ncurses', '5.9')]
 preconfigopts = "LDFLAGS='-lncurses'"
 
 sanity_check_paths = {
-    'files' : ['lib/libreadline.a', 'lib/libhistory.a'] +
-              ['include/readline/%s' % x for x in ['chardefs.h', 'history.h', 'keymaps.h', 'readline.h', 'rlconf.h',
-                                                   'rlstdc.h', 'rltypedefs.h', 'tilde.h']],
-    'dirs' : [],
+    'files': ['lib/libreadline.a', 'lib/libhistory.a'] +
+             ['include/readline/%s' % x for x in ['chardefs.h', 'history.h', 'keymaps.h', 'readline.h', 'rlconf.h',
+                                                  'rlstdc.h', 'rltypedefs.h', 'tilde.h']],
+    'dirs': [],
 }
 
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.3-intel-2016a.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.3-intel-2016a.eb
index 555538dfd5adf8ea7aff09f545cd7afa3754043e..0762f90f29f7d4705159aa0ac8590730bf7013da 100644
--- a/easybuild/easyconfigs/l/libreadline/libreadline-6.3-intel-2016a.eb
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.3-intel-2016a.eb
@@ -21,10 +21,10 @@ dependencies = [('ncurses', '6.0')]
 preconfigopts = "LDFLAGS='-lncurses'"
 
 sanity_check_paths = {
-    'files' : ['lib/libreadline.a', 'lib/libhistory.a'] +
-              ['include/readline/%s' % x for x in ['chardefs.h', 'history.h', 'keymaps.h', 'readline.h', 'rlconf.h',
-                                                   'rlstdc.h', 'rltypedefs.h', 'tilde.h']],
-    'dirs' : [],
+    'files': ['lib/libreadline.a', 'lib/libhistory.a'] +
+    ['include/readline/%s' % x for x in ['chardefs.h', 'history.h', 'keymaps.h', 'readline.h', 'rlconf.h',
+                                         'rlstdc.h', 'rltypedefs.h', 'tilde.h']],
+    'dirs': [],
 }
 
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libsodium/libsodium-1.0.8-foss-2015a.eb b/easybuild/easyconfigs/l/libsodium/libsodium-1.0.8-foss-2015a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..9293b733b8aed9fdd76f23951d9a4aa933787913
--- /dev/null
+++ b/easybuild/easyconfigs/l/libsodium/libsodium-1.0.8-foss-2015a.eb
@@ -0,0 +1,20 @@
+easyblock = 'ConfigureMake'
+
+name = 'libsodium'
+version = '1.0.8'
+
+homepage = 'http://doc.libsodium.org/'
+description = """Sodium is a modern, easy-to-use software library for encryption, decryption, signatures,
+ password hashing and more."""
+
+toolchain = {'name': 'foss', 'version': '2015a'}
+
+source_urls = ['https://download.libsodium.org/libsodium/releases/']
+sources = [SOURCE_TAR_GZ]
+
+sanity_check_paths = {
+    'files': ['include/sodium.h', 'lib/libsodium.%s' % SHLIB_EXT, 'lib/libsodium.a'],
+    'dirs': ['include/sodium', 'lib/pkgconfig'],
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libtool/libtool-2.4.2-ictce-4.0.6.eb b/easybuild/easyconfigs/l/libtool/libtool-2.4.2-ictce-4.0.6.eb
index cf4ec0fba352781a64222232ece0e3d9e1cc2920..2d8ce10f061fb442d47dbcccece327238b84cb49 100644
--- a/easybuild/easyconfigs/l/libtool/libtool-2.4.2-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/l/libtool/libtool-2.4.2-ictce-4.0.6.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': 'ictce', 'version' : '4.0.6'}
+toolchain = {'name': 'ictce', 'version': '4.0.6'}
 
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = [GNU_SOURCE]
diff --git a/easybuild/easyconfigs/l/libtool/libtool-2.4.2-ictce-4.1.13.eb b/easybuild/easyconfigs/l/libtool/libtool-2.4.2-ictce-4.1.13.eb
index a9c05667103236c49cc90797bbc69b85cf48c606..3c57c305b2ea87739347f951b922f21e7e49ec06 100644
--- a/easybuild/easyconfigs/l/libtool/libtool-2.4.2-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/l/libtool/libtool-2.4.2-ictce-4.1.13.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': 'ictce', 'version' : '4.1.13'}
+toolchain = {'name': 'ictce', 'version': '4.1.13'}
 
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = [GNU_SOURCE]
diff --git a/easybuild/easyconfigs/l/libtool/libtool-2.4.6-ictce-5.5.0.eb b/easybuild/easyconfigs/l/libtool/libtool-2.4.6-ictce-5.5.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..cbd60cd24a9720fbd2a272559db3c768672472f8
--- /dev/null
+++ b/easybuild/easyconfigs/l/libtool/libtool-2.4.6-ictce-5.5.0.eb
@@ -0,0 +1,17 @@
+easyblock = 'ConfigureMake'
+
+name = 'libtool'
+version = '2.4.6'
+
+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': 'ictce', 'version': '5.5.0'}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = [GNU_SOURCE]
+
+dependencies = [('M4', '1.4.16')]
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libunistring/libunistring-0.9.3-GNU-4.9.3-2.25.eb b/easybuild/easyconfigs/l/libunistring/libunistring-0.9.3-GNU-4.9.3-2.25.eb
index 9c592ae30c09316c09c24d7a9f1bbd490cb43a12..be0b09dcd1b3e01ee051fb6512768d552087587c 100644
--- a/easybuild/easyconfigs/l/libunistring/libunistring-0.9.3-GNU-4.9.3-2.25.eb
+++ b/easybuild/easyconfigs/l/libunistring/libunistring-0.9.3-GNU-4.9.3-2.25.eb
@@ -15,10 +15,10 @@ source_urls = [GNU_SOURCE]
 parallel = 1
 
 sanity_check_paths = {
-    'files' : ['lib/libunistring.a', 'lib/libunistring.%s' % SHLIB_EXT] +
-              ['include/uni%s.h' % x for x in ['case', 'conv', 'ctype', 'lbrk', 'name', 'norm',
-                                               'stdio', 'str', 'types', 'wbrk', 'width']],
-    'dirs' : ['include/unistring'],
+    'files': ['lib/libunistring.a', 'lib/libunistring.%s' % SHLIB_EXT] +
+             ['include/uni%s.h' % x for x in ['case', 'conv', 'ctype', 'lbrk', 'name', 'norm',
+                                              'stdio', 'str', 'types', 'wbrk', 'width']],
+    'dirs': ['include/unistring'],
 }
 
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libunistring/libunistring-0.9.3-foss-2015b.eb b/easybuild/easyconfigs/l/libunistring/libunistring-0.9.3-foss-2015b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..3c6b226b5a25dfe259d993ddd2466818722152db
--- /dev/null
+++ b/easybuild/easyconfigs/l/libunistring/libunistring-0.9.3-foss-2015b.eb
@@ -0,0 +1,24 @@
+easyblock = 'ConfigureMake'
+
+name = 'libunistring'
+version = '0.9.3'
+
+homepage = 'http://www.gnu.org/software/libunistring/'
+description = """This library provides functions for manipulating Unicode strings and for manipulating C strings
+ according to the Unicode standard."""
+
+toolchain = {'name': 'foss', 'version': '2015b'}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = [GNU_SOURCE]
+
+parallel = 1
+
+sanity_check_paths = {
+    'files' : ['lib/libunistring.a', 'lib/libunistring.%s' % SHLIB_EXT] +
+              ['include/uni%s.h' % x for x in ['case', 'conv', 'ctype', 'lbrk', 'name', 'norm',
+                                               'stdio', 'str', 'types', 'wbrk', 'width']],
+    'dirs' : ['include/unistring'],
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libunistring/libunistring-0.9.3-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/l/libunistring/libunistring-0.9.3-goalf-1.1.0-no-OFED.eb
index 533de6991222572f2f67b742fd7ab5688b15c939..299596c2dc49e543530683184a764c034cc68d6f 100644
--- a/easybuild/easyconfigs/l/libunistring/libunistring-0.9.3-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/l/libunistring/libunistring-0.9.3-goalf-1.1.0-no-OFED.eb
@@ -15,10 +15,10 @@ source_urls = [GNU_SOURCE]
 parallel = 1
 
 sanity_check_paths = {
-    'files' : ['lib/libunistring.a', 'lib/libunistring.%s' % SHLIB_EXT] +
-              ['include/uni%s.h' % x for x in ['case', 'conv', 'ctype', 'lbrk', 'name', 'norm',
-                                               'stdio', 'str', 'types', 'wbrk', 'width']],
-    'dirs' : ['include/unistring'],
+    'files': ['lib/libunistring.a', 'lib/libunistring.%s' % SHLIB_EXT] +
+             ['include/uni%s.h' % x for x in ['case', 'conv', 'ctype', 'lbrk', 'name', 'norm',
+                                              'stdio', 'str', 'types', 'wbrk', 'width']],
+    'dirs': ['include/unistring'],
 }
 
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libunistring/libunistring-0.9.3-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libunistring/libunistring-0.9.3-goolf-1.4.10.eb
index 31485301e10ce118d6570207d570c66e160cebe3..15da458c2e9c326c76a8767ddcead0038bead44f 100644
--- a/easybuild/easyconfigs/l/libunistring/libunistring-0.9.3-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/l/libunistring/libunistring-0.9.3-goolf-1.4.10.eb
@@ -14,10 +14,10 @@ source_urls = [GNU_SOURCE]
 parallel = 1
 
 sanity_check_paths = {
-    'files' : ['lib/libunistring.a', 'lib/libunistring.%s' % SHLIB_EXT] +
-              ['include/uni%s.h' % x for x in ['case', 'conv', 'ctype', 'lbrk', 'name', 'norm',
-                                               'stdio', 'str', 'types', 'wbrk', 'width']],
-    'dirs' : ['include/unistring'],
+    'files': ['lib/libunistring.a', 'lib/libunistring.%s' % SHLIB_EXT] +
+             ['include/uni%s.h' % x for x in ['case', 'conv', 'ctype', 'lbrk', 'name', 'norm',
+                                              'stdio', 'str', 'types', 'wbrk', 'width']],
+    'dirs': ['include/unistring'],
 }
 
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libunistring/libunistring-0.9.3-ictce-4.0.6.eb b/easybuild/easyconfigs/l/libunistring/libunistring-0.9.3-ictce-4.0.6.eb
index 18d1b4326678c555089d871ad4c4df4981637fb6..0302ef0229b8547a4163efd270ba32ed71ce87a8 100644
--- a/easybuild/easyconfigs/l/libunistring/libunistring-0.9.3-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/l/libunistring/libunistring-0.9.3-ictce-4.0.6.eb
@@ -17,10 +17,10 @@ patches = ['libunistring_icc_builtin_nan-inf.patch']
 parallel = 1
 
 sanity_check_paths = {
-    'files' : ['lib/libunistring.a', 'lib/libunistring.%s' % SHLIB_EXT] +
-              ['include/uni%s.h' % x for x in ['case', 'conv', 'ctype', 'lbrk', 'name', 'norm',
-                                               'stdio', 'str', 'types', 'wbrk', 'width']],
-    'dirs' : ['include/unistring'],
+    'files': ['lib/libunistring.a', 'lib/libunistring.%s' % SHLIB_EXT] +
+             ['include/uni%s.h' % x for x in ['case', 'conv', 'ctype', 'lbrk', 'name', 'norm',
+                                              'stdio', 'str', 'types', 'wbrk', 'width']],
+    'dirs': ['include/unistring'],
 }
 
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libunistring/libunistring-0.9.3-ictce-5.3.0.eb b/easybuild/easyconfigs/l/libunistring/libunistring-0.9.3-ictce-5.3.0.eb
index a07834afed603991052d1cdd8cf3bba76ed97bd3..1a64772a1e9994da250be4015fb371913ab0e6b2 100644
--- a/easybuild/easyconfigs/l/libunistring/libunistring-0.9.3-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/l/libunistring/libunistring-0.9.3-ictce-5.3.0.eb
@@ -17,10 +17,10 @@ patches = ['libunistring_icc_builtin_nan-inf.patch']
 parallel = 1
 
 sanity_check_paths = {
-    'files' : ['lib/libunistring.a', 'lib/libunistring.%s' % SHLIB_EXT] +
-              ['include/uni%s.h' % x for x in ['case', 'conv', 'ctype', 'lbrk', 'name', 'norm',
-                                               'stdio', 'str', 'types', 'wbrk', 'width']],
-    'dirs' : ['include/unistring'],
+    'files': ['lib/libunistring.a', 'lib/libunistring.%s' % SHLIB_EXT] +
+             ['include/uni%s.h' % x for x in ['case', 'conv', 'ctype', 'lbrk', 'name', 'norm',
+                                              'stdio', 'str', 'types', 'wbrk', 'width']],
+    'dirs': ['include/unistring'],
 }
 
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libunistring/libunistring-0.9.3-intel-2015a.eb b/easybuild/easyconfigs/l/libunistring/libunistring-0.9.3-intel-2015a.eb
index 088b49a64a83bc53c182428cae7d739d262e9a83..4bce236806628c82edc66fc3870ed814ae8a9ee3 100644
--- a/easybuild/easyconfigs/l/libunistring/libunistring-0.9.3-intel-2015a.eb
+++ b/easybuild/easyconfigs/l/libunistring/libunistring-0.9.3-intel-2015a.eb
@@ -17,10 +17,10 @@ patches = ['libunistring_icc_builtin_nan-inf.patch']
 parallel = 1
 
 sanity_check_paths = {
-    'files' : ['lib/libunistring.a', 'lib/libunistring.%s' % SHLIB_EXT] +
-              ['include/uni%s.h' % x for x in ['case', 'conv', 'ctype', 'lbrk', 'name', 'norm',
-                                               'stdio', 'str', 'types', 'wbrk', 'width']],
-    'dirs' : ['include/unistring'],
+    'files': ['lib/libunistring.a', 'lib/libunistring.%s' % SHLIB_EXT] +
+             ['include/uni%s.h' % x for x in ['case', 'conv', 'ctype', 'lbrk', 'name', 'norm',
+                                              'stdio', 'str', 'types', 'wbrk', 'width']],
+    'dirs': ['include/unistring'],
 }
 
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libunistring/libunistring-0.9.3-intel-2015b.eb b/easybuild/easyconfigs/l/libunistring/libunistring-0.9.3-intel-2015b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..19e0b26c921b9ac7415367241745a8fb07588350
--- /dev/null
+++ b/easybuild/easyconfigs/l/libunistring/libunistring-0.9.3-intel-2015b.eb
@@ -0,0 +1,26 @@
+easyblock = 'ConfigureMake'
+
+name = 'libunistring'
+version = '0.9.3'
+
+homepage = 'http://www.gnu.org/software/libunistring/'
+description = """This library provides functions for manipulating Unicode strings and for manipulating C strings
+ according to the Unicode standard."""
+
+toolchain = {'name': 'intel', 'version': '2015b'}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = [GNU_SOURCE]
+
+patches = ['libunistring_icc_builtin_nan-inf.patch']
+
+parallel = 1
+
+sanity_check_paths = {
+    'files' : ['lib/libunistring.a', 'lib/libunistring.%s' % SHLIB_EXT] +
+              ['include/uni%s.h' % x for x in ['case', 'conv', 'ctype', 'lbrk', 'name', 'norm',
+                                               'stdio', 'str', 'types', 'wbrk', 'width']],
+    'dirs' : ['include/unistring'],
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libxc/libxc-2.0.1-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libxc/libxc-2.0.1-goolf-1.4.10.eb
index f0bcc7d4a6d7bbb82af2152f340e27e1b7df81a9..bd766f2e399ee2fca5e28f2541af11ceb41c9fb9 100644
--- a/easybuild/easyconfigs/l/libxc/libxc-2.0.1-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/l/libxc/libxc-2.0.1-goolf-1.4.10.eb
@@ -32,4 +32,3 @@ sanity_check_paths = {
 parallel = 1
 
 moduleclass = 'chem'
-
diff --git a/easybuild/easyconfigs/l/libxc/libxc-2.0.1-ictce-4.1.13.eb b/easybuild/easyconfigs/l/libxc/libxc-2.0.1-ictce-4.1.13.eb
index add9d8667df2d9d9fec10f3a2dcdad7a60ee6bd6..2df71cc7a74b75b4c277ea10b1c7c88bb15e6118 100644
--- a/easybuild/easyconfigs/l/libxc/libxc-2.0.1-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/l/libxc/libxc-2.0.1-ictce-4.1.13.eb
@@ -32,4 +32,3 @@ sanity_check_paths = {
 parallel = 1
 
 moduleclass = 'chem'
-
diff --git a/easybuild/easyconfigs/l/libxc/libxc-2.0.1-ictce-5.3.0.eb b/easybuild/easyconfigs/l/libxc/libxc-2.0.1-ictce-5.3.0.eb
index f7564e13c2676fa45f5b62a03f5d607f53c979bb..f86e8ff9fbd84150b41751dc0988368e93f6fe99 100644
--- a/easybuild/easyconfigs/l/libxc/libxc-2.0.1-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/l/libxc/libxc-2.0.1-ictce-5.3.0.eb
@@ -32,4 +32,3 @@ sanity_check_paths = {
 parallel = 1
 
 moduleclass = 'chem'
-
diff --git a/easybuild/easyconfigs/l/libxc/libxc-2.0.1-ictce-5.5.0.eb b/easybuild/easyconfigs/l/libxc/libxc-2.0.1-ictce-5.5.0.eb
index 02c561f8498eb1efbb5af5df19f86e1b9efef817..4c45b545b5f57f417c6b322c76e45f7c4611a2ac 100644
--- a/easybuild/easyconfigs/l/libxc/libxc-2.0.1-ictce-5.5.0.eb
+++ b/easybuild/easyconfigs/l/libxc/libxc-2.0.1-ictce-5.5.0.eb
@@ -30,4 +30,3 @@ sanity_check_paths = {
 parallel = 1
 
 moduleclass = 'chem'
-
diff --git a/easybuild/easyconfigs/l/libxc/libxc-2.0.2-ictce-5.3.0.eb b/easybuild/easyconfigs/l/libxc/libxc-2.0.2-ictce-5.3.0.eb
index f008d8268a33f100b0b5237fdf818f8fd00a4a3a..e6561d3ed6247b822c632cf1a9f3be9359fdfd6f 100644
--- a/easybuild/easyconfigs/l/libxc/libxc-2.0.2-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/l/libxc/libxc-2.0.2-ictce-5.3.0.eb
@@ -30,4 +30,3 @@ sanity_check_paths = {
 parallel = 1
 
 moduleclass = 'chem'
-
diff --git a/easybuild/easyconfigs/l/libxcb/libxcb-1.10-foss-2014b-Python-2.7.8.eb b/easybuild/easyconfigs/l/libxcb/libxcb-1.10-foss-2014b-Python-2.7.8.eb
index 642e8c5309cc052b0cf97ab29001dd2bb531dd18..104ccdae658cbda1f724a16b5a4d5e4b5d447df6 100644
--- a/easybuild/easyconfigs/l/libxcb/libxcb-1.10-foss-2014b-Python-2.7.8.eb
+++ b/easybuild/easyconfigs/l/libxcb/libxcb-1.10-foss-2014b-Python-2.7.8.eb
@@ -9,7 +9,7 @@ latency hiding, direct access to the protocol, improved threading support, and e
 
 toolchain = {'name': 'foss', 'version': '2014b'}
 
-source_urls  = ['http://xcb.freedesktop.org/dist/']
+source_urls = ['http://xcb.freedesktop.org/dist/']
 sources = [SOURCELOWER_TAR_GZ]
 
 python = 'Python'
@@ -26,10 +26,10 @@ dependencies = [
 #preconfigopts = "rm -r aclocal.m4 configure Makefile.in ltmain.sh && ./autogen.sh && "
 
 sanity_check_paths = {
-    'files' : ['lib/libxcb%s.a' % x for x in ["", "-composite", "-damage", "-dpms", "-dri2", "-glx",
-                                              "-randr", "-record", "-render", "-res", "-screensaver",
-                                              "-shape", "-shm", "-sync", "-xevie", "-xf86dri", "-xfixes",
-                                              "-xinerama", "-xprint", "-xtest", "-xv", "-xvmc"]],
+    'files': ['lib/libxcb%s.a' % x for x in ["", "-composite", "-damage", "-dpms", "-dri2", "-glx",
+                                             "-randr", "-record", "-render", "-res", "-screensaver",
+                                             "-shape", "-shm", "-sync", "-xevie", "-xf86dri", "-xfixes",
+                                             "-xinerama", "-xprint", "-xtest", "-xv", "-xvmc"]],
     'dirs': ['include/xcb', 'lib/pkgconfig'],
 }
 
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 930f6a164fdc51f0a6444e48c0dd8a7bcf57fb04..72ed48fe999f3a8f995c69789358ff80d9ef6ee5 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
@@ -9,7 +9,7 @@ latency hiding, direct access to the protocol, improved threading support, and e
 
 toolchain = {'name': 'intel', 'version': '2014b'}
 
-source_urls  = ['http://xcb.freedesktop.org/dist/']
+source_urls = ['http://xcb.freedesktop.org/dist/']
 sources = [SOURCELOWER_TAR_GZ]
 
 python = 'Python'
@@ -24,10 +24,10 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files' : ['lib/libxcb%s.a' % x for x in ["", "-composite", "-damage", "-dpms", "-dri2", "-glx",
-                                              "-randr", "-record", "-render", "-res", "-screensaver",
-                                              "-shape", "-shm", "-sync", "-xevie", "-xf86dri", "-xfixes",
-                                              "-xinerama", "-xprint", "-xtest", "-xv", "-xvmc"]],
+    'files': ['lib/libxcb%s.a' % x for x in ["", "-composite", "-damage", "-dpms", "-dri2", "-glx",
+                                             "-randr", "-record", "-render", "-res", "-screensaver",
+                                             "-shape", "-shm", "-sync", "-xevie", "-xf86dri", "-xfixes",
+                                             "-xinerama", "-xprint", "-xtest", "-xv", "-xvmc"]],
     'dirs': ['include/xcb', 'lib/pkgconfig'],
 }
 
diff --git a/easybuild/easyconfigs/l/libxcb/libxcb-1.11-goolf-1.5.14-Python-2.7.9.eb b/easybuild/easyconfigs/l/libxcb/libxcb-1.11-goolf-1.5.14-Python-2.7.9.eb
index bd5e7ed56dd8b8a807b65204d6e6c184a37620bf..26de0f9322d3c4e41f2cfa86bf2b3d53fabc2984 100644
--- a/easybuild/easyconfigs/l/libxcb/libxcb-1.11-goolf-1.5.14-Python-2.7.9.eb
+++ b/easybuild/easyconfigs/l/libxcb/libxcb-1.11-goolf-1.5.14-Python-2.7.9.eb
@@ -9,7 +9,7 @@ description = """The X protocol C-language Binding (XCB) is a replacement for Xl
 
 toolchain = {'name': 'goolf', 'version': '1.5.14'}
 
-source_urls  = ['http://xcb.freedesktop.org/dist/']
+source_urls = ['http://xcb.freedesktop.org/dist/']
 sources = [SOURCELOWER_TAR_GZ]
 
 python = 'Python'
@@ -21,10 +21,10 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files' : ['lib/libxcb%s.a' % x for x in ["", "-composite", "-damage", "-dpms", "-dri2", "-glx",
-                                              "-randr", "-record", "-render", "-res", "-screensaver",
-                                              "-shape", "-shm", "-sync", "-xevie", "-xf86dri", "-xfixes",
-                                              "-xinerama", "-xprint", "-xtest", "-xv", "-xvmc"]],
+    'files': ['lib/libxcb%s.a' % x for x in ["", "-composite", "-damage", "-dpms", "-dri2", "-glx",
+                                             "-randr", "-record", "-render", "-res", "-screensaver",
+                                             "-shape", "-shm", "-sync", "-xevie", "-xf86dri", "-xfixes",
+                                             "-xinerama", "-xprint", "-xtest", "-xv", "-xvmc"]],
     'dirs': ['include/xcb', 'lib/pkgconfig'],
 }
 
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 09a13b616da5170643ccf545cf753bfd34e4cbf1..4f2074c3fbd7fd8116117d9451665ba50f0c2dea 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
@@ -9,7 +9,7 @@ latency hiding, direct access to the protocol, improved threading support, and e
 
 toolchain = {'name': 'intel', 'version': '2015a'}
 
-source_urls  = ['http://xcb.freedesktop.org/dist/']
+source_urls = ['http://xcb.freedesktop.org/dist/']
 sources = [SOURCELOWER_TAR_GZ]
 
 python = 'Python'
@@ -24,10 +24,10 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files' : ['lib/libxcb%s.a' % x for x in ["", "-composite", "-damage", "-dpms", "-dri2", "-glx",
-                                              "-randr", "-record", "-render", "-res", "-screensaver",
-                                              "-shape", "-shm", "-sync", "-xevie", "-xf86dri", "-xfixes",
-                                              "-xinerama", "-xprint", "-xtest", "-xv", "-xvmc"]],
+    'files': ['lib/libxcb%s.a' % x for x in ["", "-composite", "-damage", "-dpms", "-dri2", "-glx",
+                                             "-randr", "-record", "-render", "-res", "-screensaver",
+                                             "-shape", "-shm", "-sync", "-xevie", "-xf86dri", "-xfixes",
+                                             "-xinerama", "-xprint", "-xtest", "-xv", "-xvmc"]],
     'dirs': ['include/xcb', 'lib/pkgconfig'],
 }
 
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 68acb79d5bf1c14aa703728a0b7c1493ad3145b4..d72a9273ac8a5567114e964a56e242485cfa0d1c 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
@@ -9,7 +9,7 @@ latency hiding, direct access to the protocol, improved threading support, and e
 
 toolchain = {'name': 'intel', 'version': '2015a'}
 
-source_urls  = ['http://xcb.freedesktop.org/dist/']
+source_urls = ['http://xcb.freedesktop.org/dist/']
 sources = [SOURCELOWER_TAR_GZ]
 
 python = 'Python'
@@ -24,10 +24,10 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files' : ['lib/libxcb%s.a' % x for x in ["", "-composite", "-damage", "-dpms", "-dri2", "-glx",
-                                              "-randr", "-record", "-render", "-res", "-screensaver",
-                                              "-shape", "-shm", "-sync", "-xevie", "-xf86dri", "-xfixes",
-                                              "-xinerama", "-xprint", "-xtest", "-xv", "-xvmc"]],
+    'files': ['lib/libxcb%s.a' % x for x in ["", "-composite", "-damage", "-dpms", "-dri2", "-glx",
+                                             "-randr", "-record", "-render", "-res", "-screensaver",
+                                             "-shape", "-shm", "-sync", "-xevie", "-xf86dri", "-xfixes",
+                                             "-xinerama", "-xprint", "-xtest", "-xv", "-xvmc"]],
     'dirs': ['include/xcb', 'lib/pkgconfig'],
 }
 
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 482b2014e9da106776c2d9de55f88fb403b737b1..6621cf1702ea0a11abe35ba005150ace3facb9ff 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
@@ -9,7 +9,7 @@ latency hiding, direct access to the protocol, improved threading support, and e
 
 toolchain = {'name': 'intel', 'version': '2015b'}
 
-source_urls  = ['http://xcb.freedesktop.org/dist/']
+source_urls = ['http://xcb.freedesktop.org/dist/']
 sources = [SOURCELOWER_TAR_GZ]
 
 python = 'Python'
@@ -24,10 +24,10 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files' : ['lib/libxcb%s.a' % x for x in ["", "-composite", "-damage", "-dpms", "-dri2", "-glx",
-                                              "-randr", "-record", "-render", "-res", "-screensaver",
-                                              "-shape", "-shm", "-sync", "-xevie", "-xf86dri", "-xfixes",
-                                              "-xinerama", "-xprint", "-xtest", "-xv", "-xvmc"]],
+    'files': ['lib/libxcb%s.a' % x for x in ["", "-composite", "-damage", "-dpms", "-dri2", "-glx",
+                                             "-randr", "-record", "-render", "-res", "-screensaver",
+                                             "-shape", "-shm", "-sync", "-xevie", "-xf86dri", "-xfixes",
+                                             "-xinerama", "-xprint", "-xtest", "-xv", "-xvmc"]],
     'dirs': ['include/xcb', 'lib/pkgconfig'],
 }
 
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 c9239b151b55e210d05aff682176d6cef4cc90aa..cc7392bf9ec3256a76c6f3aeb444984aca4e0a26 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
@@ -9,7 +9,7 @@ latency hiding, direct access to the protocol, improved threading support, and e
 
 toolchain = {'name': 'intel', 'version': '2015b'}
 
-source_urls  = ['http://xcb.freedesktop.org/dist/']
+source_urls = ['http://xcb.freedesktop.org/dist/']
 sources = [SOURCELOWER_TAR_GZ]
 
 python = 'Python'
@@ -24,10 +24,10 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files' : ['lib/libxcb%s.a' % x for x in ["", "-composite", "-damage", "-dpms", "-dri2", "-glx",
-                                              "-randr", "-record", "-render", "-res", "-screensaver",
-                                              "-shape", "-shm", "-sync", "-xevie", "-xf86dri", "-xfixes",
-                                              "-xinerama", "-xprint", "-xtest", "-xv", "-xvmc"]],
+    'files': ['lib/libxcb%s.a' % x for x in ["", "-composite", "-damage", "-dpms", "-dri2", "-glx",
+                                             "-randr", "-record", "-render", "-res", "-screensaver",
+                                             "-shape", "-shm", "-sync", "-xevie", "-xf86dri", "-xfixes",
+                                             "-xinerama", "-xprint", "-xtest", "-xv", "-xvmc"]],
     'dirs': ['include/xcb', 'lib/pkgconfig'],
 }
 
diff --git a/easybuild/easyconfigs/l/libxcb/libxcb-1.8-goalf-1.1.0-no-OFED-Python-2.7.3.eb b/easybuild/easyconfigs/l/libxcb/libxcb-1.8-goalf-1.1.0-no-OFED-Python-2.7.3.eb
index c58daba38a2ac362412a20b0036a6d025ff84daa..2a5245540388fb6992943a0f930f340f868af332 100644
--- a/easybuild/easyconfigs/l/libxcb/libxcb-1.8-goalf-1.1.0-no-OFED-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/l/libxcb/libxcb-1.8-goalf-1.1.0-no-OFED-Python-2.7.3.eb
@@ -9,7 +9,7 @@ description = """The X protocol C-language Binding (XCB) is a replacement for Xl
 
 toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
 
-source_urls  = ['http://xcb.freedesktop.org/dist/']
+source_urls = ['http://xcb.freedesktop.org/dist/']
 sources = [SOURCELOWER_TAR_GZ]
 
 patches = ['libxcb-no-pthread-stubs.patch']
@@ -25,10 +25,10 @@ dependencies = [
 preconfigopts = "rm -r aclocal.m4 configure Makefile.in ltmain.sh && ./autogen.sh && "
 
 sanity_check_paths = {
-    'files' : ['lib/libxcb%s.a' % x for x in ["", "-composite", "-damage", "-dpms", "-dri2", "-glx",
-                                              "-randr", "-record", "-render", "-res", "-screensaver",
-                                              "-shape", "-shm", "-sync", "-xevie", "-xf86dri", "-xfixes",
-                                              "-xinerama", "-xprint", "-xtest", "-xv", "-xvmc"]],
+    'files': ['lib/libxcb%s.a' % x for x in ["", "-composite", "-damage", "-dpms", "-dri2", "-glx",
+                                             "-randr", "-record", "-render", "-res", "-screensaver",
+                                             "-shape", "-shm", "-sync", "-xevie", "-xf86dri", "-xfixes",
+                                             "-xinerama", "-xprint", "-xtest", "-xv", "-xvmc"]],
     'dirs': ['include/xcb', 'lib/pkgconfig'],
 }
 
diff --git a/easybuild/easyconfigs/l/libxcb/libxcb-1.8-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/l/libxcb/libxcb-1.8-goolf-1.4.10-Python-2.7.3.eb
index 3be17369402f2b29092e07b3e560cc9825a0b087..a52d5bb05da8d07c076f4e98368c126d5b25f47c 100644
--- a/easybuild/easyconfigs/l/libxcb/libxcb-1.8-goolf-1.4.10-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/l/libxcb/libxcb-1.8-goolf-1.4.10-Python-2.7.3.eb
@@ -9,7 +9,7 @@ latency hiding, direct access to the protocol, improved threading support, and e
 
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 
-source_urls  = ['http://xcb.freedesktop.org/dist/']
+source_urls = ['http://xcb.freedesktop.org/dist/']
 sources = [SOURCELOWER_TAR_GZ]
 
 patches = ['libxcb-no-pthread-stubs.patch']
@@ -25,10 +25,10 @@ dependencies = [
 preconfigopts = "rm -r aclocal.m4 configure Makefile.in ltmain.sh && ./autogen.sh && "
 
 sanity_check_paths = {
-    'files' : ['lib/libxcb%s.a' % x for x in ["", "-composite", "-damage", "-dpms", "-dri2", "-glx",
-                                              "-randr", "-record", "-render", "-res", "-screensaver",
-                                              "-shape", "-shm", "-sync", "-xevie", "-xf86dri", "-xfixes",
-                                              "-xinerama", "-xprint", "-xtest", "-xv", "-xvmc"]],
+    'files': ['lib/libxcb%s.a' % x for x in ["", "-composite", "-damage", "-dpms", "-dri2", "-glx",
+                                             "-randr", "-record", "-render", "-res", "-screensaver",
+                                             "-shape", "-shm", "-sync", "-xevie", "-xf86dri", "-xfixes",
+                                             "-xinerama", "-xprint", "-xtest", "-xv", "-xvmc"]],
     'dirs': ['include/xcb', 'lib/pkgconfig'],
 }
 
diff --git a/easybuild/easyconfigs/l/libxcb/libxcb-1.8-goolf-1.5.14-Python-2.7.3.eb b/easybuild/easyconfigs/l/libxcb/libxcb-1.8-goolf-1.5.14-Python-2.7.3.eb
index a3fa51e67e0d24c7a4344c304040e04f115d2859..056448ccd25338e048448f0356a36a48e3623b36 100644
--- a/easybuild/easyconfigs/l/libxcb/libxcb-1.8-goolf-1.5.14-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/l/libxcb/libxcb-1.8-goolf-1.5.14-Python-2.7.3.eb
@@ -9,7 +9,7 @@ latency hiding, direct access to the protocol, improved threading support, and e
 
 toolchain = {'name': 'goolf', 'version': '1.5.14'}
 
-source_urls  = ['http://xcb.freedesktop.org/dist/']
+source_urls = ['http://xcb.freedesktop.org/dist/']
 sources = [SOURCELOWER_TAR_GZ]
 
 patches = ['libxcb-no-pthread-stubs.patch']
@@ -25,10 +25,10 @@ dependencies = [
 preconfigopts = "rm -r aclocal.m4 configure Makefile.in ltmain.sh && ./autogen.sh && "
 
 sanity_check_paths = {
-    'files' : ['lib/libxcb%s.a' % x for x in ["", "-composite", "-damage", "-dpms", "-dri2", "-glx",
-                                              "-randr", "-record", "-render", "-res", "-screensaver",
-                                              "-shape", "-shm", "-sync", "-xevie", "-xf86dri", "-xfixes",
-                                              "-xinerama", "-xprint", "-xtest", "-xv", "-xvmc"]],
+    'files': ['lib/libxcb%s.a' % x for x in ["", "-composite", "-damage", "-dpms", "-dri2", "-glx",
+                                             "-randr", "-record", "-render", "-res", "-screensaver",
+                                             "-shape", "-shm", "-sync", "-xevie", "-xf86dri", "-xfixes",
+                                             "-xinerama", "-xprint", "-xtest", "-xv", "-xvmc"]],
     'dirs': ['include/xcb', 'lib/pkgconfig'],
 }
 
diff --git a/easybuild/easyconfigs/l/libxcb/libxcb-1.8-ictce-4.0.6-Python-2.7.3.eb b/easybuild/easyconfigs/l/libxcb/libxcb-1.8-ictce-4.0.6-Python-2.7.3.eb
index 6d757e7d793f43021c1f60103909e24b17499599..13680508997a74b80c001f42692db8e29ee9eeb1 100644
--- a/easybuild/easyconfigs/l/libxcb/libxcb-1.8-ictce-4.0.6-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/l/libxcb/libxcb-1.8-ictce-4.0.6-Python-2.7.3.eb
@@ -9,7 +9,7 @@ description = """The X protocol C-language Binding (XCB) is a replacement for Xl
 
 toolchain = {'name': 'ictce', 'version': '4.0.6'}
 
-source_urls  = ['http://xcb.freedesktop.org/dist/']
+source_urls = ['http://xcb.freedesktop.org/dist/']
 sources = [SOURCELOWER_TAR_GZ]
 
 patches = ['libxcb-no-pthread-stubs.patch']
@@ -25,10 +25,10 @@ dependencies = [
 preconfigopts = "rm -r aclocal.m4 configure Makefile.in ltmain.sh && ./autogen.sh && "
 
 sanity_check_paths = {
-    'files' : ['lib/libxcb%s.a' % x for x in ["", "-composite", "-damage", "-dpms", "-dri2", "-glx",
-                                              "-randr", "-record", "-render", "-res", "-screensaver",
-                                              "-shape", "-shm", "-sync", "-xevie", "-xf86dri", "-xfixes",
-                                              "-xinerama", "-xprint", "-xtest", "-xv", "-xvmc"]],
+    'files': ['lib/libxcb%s.a' % x for x in ["", "-composite", "-damage", "-dpms", "-dri2", "-glx",
+                                             "-randr", "-record", "-render", "-res", "-screensaver",
+                                             "-shape", "-shm", "-sync", "-xevie", "-xf86dri", "-xfixes",
+                                             "-xinerama", "-xprint", "-xtest", "-xv", "-xvmc"]],
     'dirs': ['include/xcb', 'lib/pkgconfig'],
 }
 
diff --git a/easybuild/easyconfigs/l/libxcb/libxcb-1.8-ictce-4.1.13-Python-2.7.3.eb b/easybuild/easyconfigs/l/libxcb/libxcb-1.8-ictce-4.1.13-Python-2.7.3.eb
index 09100be56b7e602a0fbd4d3aa0efd746d1a8b640..68e4849e5848c59ffc3cbae0d0c7d694f34e9626 100644
--- a/easybuild/easyconfigs/l/libxcb/libxcb-1.8-ictce-4.1.13-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/l/libxcb/libxcb-1.8-ictce-4.1.13-Python-2.7.3.eb
@@ -9,7 +9,7 @@ description = """The X protocol C-language Binding (XCB) is a replacement for Xl
 
 toolchain = {'name': 'ictce', 'version': '4.1.13'}
 
-source_urls  = ['http://xcb.freedesktop.org/dist/']
+source_urls = ['http://xcb.freedesktop.org/dist/']
 sources = [SOURCELOWER_TAR_GZ]
 
 patches = ['libxcb-no-pthread-stubs.patch']
@@ -25,10 +25,10 @@ dependencies = [
 preconfigopts = "rm -r aclocal.m4 configure Makefile.in ltmain.sh && ./autogen.sh && "
 
 sanity_check_paths = {
-    'files' : ['lib/libxcb%s.a' % x for x in ["", "-composite", "-damage", "-dpms", "-dri2", "-glx",
-                                              "-randr", "-record", "-render", "-res", "-screensaver",
-                                              "-shape", "-shm", "-sync", "-xevie", "-xf86dri", "-xfixes",
-                                              "-xinerama", "-xprint", "-xtest", "-xv", "-xvmc"]],
+    'files': ['lib/libxcb%s.a' % x for x in ["", "-composite", "-damage", "-dpms", "-dri2", "-glx",
+                                             "-randr", "-record", "-render", "-res", "-screensaver",
+                                             "-shape", "-shm", "-sync", "-xevie", "-xf86dri", "-xfixes",
+                                             "-xinerama", "-xprint", "-xtest", "-xv", "-xvmc"]],
     'dirs': ['include/xcb', 'lib/pkgconfig'],
 }
 
diff --git a/easybuild/easyconfigs/l/libxcb/libxcb-1.8-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/l/libxcb/libxcb-1.8-ictce-5.3.0-Python-2.7.3.eb
index 879b645f96be8cc8376cd554b053919c2a96e94f..16f804c17d2732f945e5241780ef1b45b38f07d7 100644
--- a/easybuild/easyconfigs/l/libxcb/libxcb-1.8-ictce-5.3.0-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/l/libxcb/libxcb-1.8-ictce-5.3.0-Python-2.7.3.eb
@@ -9,7 +9,7 @@ description = """The X protocol C-language Binding (XCB) is a replacement for Xl
 
 toolchain = {'name': 'ictce', 'version': '5.3.0'}
 
-source_urls  = ['http://xcb.freedesktop.org/dist/']
+source_urls = ['http://xcb.freedesktop.org/dist/']
 sources = [SOURCELOWER_TAR_GZ]
 
 patches = ['libxcb-no-pthread-stubs.patch']
@@ -25,10 +25,10 @@ dependencies = [
 preconfigopts = "rm -r aclocal.m4 configure Makefile.in ltmain.sh && ./autogen.sh && "
 
 sanity_check_paths = {
-    'files' : ['lib/libxcb%s.a' % x for x in ["", "-composite", "-damage", "-dpms", "-dri2", "-glx",
-                                              "-randr", "-record", "-render", "-res", "-screensaver",
-                                              "-shape", "-shm", "-sync", "-xevie", "-xf86dri", "-xfixes",
-                                              "-xinerama", "-xprint", "-xtest", "-xv", "-xvmc"]],
+    'files': ['lib/libxcb%s.a' % x for x in ["", "-composite", "-damage", "-dpms", "-dri2", "-glx",
+                                             "-randr", "-record", "-render", "-res", "-screensaver",
+                                             "-shape", "-shm", "-sync", "-xevie", "-xf86dri", "-xfixes",
+                                             "-xinerama", "-xprint", "-xtest", "-xv", "-xvmc"]],
     'dirs': ['include/xcb', 'lib/pkgconfig'],
 }
 
diff --git a/easybuild/easyconfigs/l/libxcb/libxcb-1.8-intel-2014b-Python-2.7.8.eb b/easybuild/easyconfigs/l/libxcb/libxcb-1.8-intel-2014b-Python-2.7.8.eb
index eca2fdff48c14e5c1f1c11af774c0caf5d7d3bf2..8c055b95721e065aff2bb3467820227ace1b85f9 100644
--- a/easybuild/easyconfigs/l/libxcb/libxcb-1.8-intel-2014b-Python-2.7.8.eb
+++ b/easybuild/easyconfigs/l/libxcb/libxcb-1.8-intel-2014b-Python-2.7.8.eb
@@ -9,7 +9,7 @@ description = """The X protocol C-language Binding (XCB) is a replacement for Xl
 
 toolchain = {'name': 'intel', 'version': '2014b'}
 
-source_urls  = ['http://xcb.freedesktop.org/dist/']
+source_urls = ['http://xcb.freedesktop.org/dist/']
 sources = [SOURCELOWER_TAR_GZ]
 
 patches = ['libxcb-no-pthread-stubs.patch']
@@ -25,10 +25,10 @@ dependencies = [
 preconfigopts = "rm -r aclocal.m4 configure Makefile.in ltmain.sh && ./autogen.sh && "
 
 sanity_check_paths = {
-    'files' : ['lib/libxcb%s.a' % x for x in ["", "-composite", "-damage", "-dpms", "-dri2", "-glx",
-                                              "-randr", "-record", "-render", "-res", "-screensaver",
-                                              "-shape", "-shm", "-sync", "-xevie", "-xf86dri", "-xfixes",
-                                              "-xinerama", "-xprint", "-xtest", "-xv", "-xvmc"]],
+    'files': ['lib/libxcb%s.a' % x for x in ["", "-composite", "-damage", "-dpms", "-dri2", "-glx",
+                                             "-randr", "-record", "-render", "-res", "-screensaver",
+                                             "-shape", "-shm", "-sync", "-xevie", "-xf86dri", "-xfixes",
+                                             "-xinerama", "-xprint", "-xtest", "-xv", "-xvmc"]],
     'dirs': ['include/xcb', 'lib/pkgconfig'],
 }
 
diff --git a/easybuild/easyconfigs/l/libxkbcommon/libxkbcommon-0.5.0-intel-2015b-Python-2.7.11.eb b/easybuild/easyconfigs/l/libxkbcommon/libxkbcommon-0.5.0-intel-2015b-Python-2.7.11.eb
index 5308b095b34ae1c5f917c4f6eed61f8809fb22ad..c8fafe0222dc2fc306730ad12e42a3cfac304634 100644
--- a/easybuild/easyconfigs/l/libxkbcommon/libxkbcommon-0.5.0-intel-2015b-Python-2.7.11.eb
+++ b/easybuild/easyconfigs/l/libxkbcommon/libxkbcommon-0.5.0-intel-2015b-Python-2.7.11.eb
@@ -12,7 +12,7 @@ description = """xkbcommon is a library to handle keyboard descriptions,
 
 toolchain = {'name': 'intel', 'version': '2015b'}
 
-source_urls  = ['http://xkbcommon.org/download/']
+source_urls = ['http://xkbcommon.org/download/']
 sources = [SOURCELOWER_TAR_XZ]
 
 dependencies = [
diff --git a/easybuild/easyconfigs/l/libxkbcommon/libxkbcommon-0.5.0-intel-2015b.eb b/easybuild/easyconfigs/l/libxkbcommon/libxkbcommon-0.5.0-intel-2015b.eb
index b315eb6d84d3bbbc5b97abe0ca3ded1a2e514e3f..936890773fd1cd62e48ff0d6ca507e4274a4ceaf 100644
--- a/easybuild/easyconfigs/l/libxkbcommon/libxkbcommon-0.5.0-intel-2015b.eb
+++ b/easybuild/easyconfigs/l/libxkbcommon/libxkbcommon-0.5.0-intel-2015b.eb
@@ -11,7 +11,7 @@ description = """xkbcommon is a library to handle keyboard descriptions,
 
 toolchain = {'name': 'intel', 'version': '2015b'}
 
-source_urls  = ['http://xkbcommon.org/download/']
+source_urls = ['http://xkbcommon.org/download/']
 sources = [SOURCELOWER_TAR_XZ]
 
 dependencies = [
diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.8.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.8.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb
index 5fdaa5d70ccb0afd6be90eb29879d161be4a0909..e98bac6018d8b2d18206da236d52f016c17c24fa 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.8.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.8.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb
@@ -14,7 +14,7 @@ source_urls = [
 ]
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = 'CC="$CC" CXX="$CXX" --with-pic'
+configopts = 'CC="$CC" CXX="$CXX" --with-pic --with-zlib=$EBROOTZLIB'
 
 pythonver = '2.7.3'
 pythonshortver = '.'.join(pythonver.split('.')[0:2])
diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.8.0-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.8.0-goalf-1.1.0-no-OFED.eb
index 952422def75ac3c365019293701b322261570414..4a4a4816ab2e8285a429accaf788d3b62c0090a9 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.8.0-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.8.0-goalf-1.1.0-no-OFED.eb
@@ -16,7 +16,7 @@ source_urls = [
 ]
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python'
+configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python --with-zlib=$EBROOTZLIB'
 
 dependencies = [('zlib', '1.2.7')]
 
diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.8.0-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.8.0-goolf-1.4.10-Python-2.7.3.eb
index 4a1316692f7a0eef74b4c8a15a1158679a31b62e..e1868be130ff398cabf41c2b25011dc0b7649851 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.8.0-goolf-1.4.10-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.8.0-goolf-1.4.10-Python-2.7.3.eb
@@ -13,7 +13,7 @@ source_urls = [
 ]
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = 'CC="$CC" CXX="$CXX" --with-pic'
+configopts = 'CC="$CC" CXX="$CXX" --with-pic --with-zlib=$EBROOTZLIB'
 
 pythonver = '2.7.3'
 pythonshortver = '.'.join(pythonver.split('.')[0:2])
diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.8.0-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.8.0-goolf-1.4.10.eb
index f2fa0134cb22a0bd5b3d773d6591c647d5b90ae7..00021cddc927def653589c79778a6281c6125a56 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.8.0-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.8.0-goolf-1.4.10.eb
@@ -15,7 +15,7 @@ source_urls = [
 ]
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python'
+configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python --with-zlib=$EBROOTZLIB'
 
 dependencies = [('zlib', '1.2.7')]
 
diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.8.0-ictce-4.0.6-Python-2.7.3.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.8.0-ictce-4.0.6-Python-2.7.3.eb
index 33784ddde95c35192aa681170b6ca6c1606b7368..b82e8e6c939dd27f6797f6fc9bc243ce463660db 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.8.0-ictce-4.0.6-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.8.0-ictce-4.0.6-Python-2.7.3.eb
@@ -14,7 +14,7 @@ source_urls = [
 ]
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = 'CC="$CC" CXX="$CXX" --with-pic'
+configopts = 'CC="$CC" CXX="$CXX" --with-pic --with-zlib=$EBROOTZLIB'
 
 pythonver = '2.7.3'
 pythonshortver = '.'.join(pythonver.split('.')[0:2])
diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.8.0-ictce-4.0.6.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.8.0-ictce-4.0.6.eb
index 3117fe0a651669733dc46050324a8651939ae917..91e1ffbc9cf78ac331e8e58b273a81ba7b6292a6 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.8.0-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.8.0-ictce-4.0.6.eb
@@ -16,7 +16,7 @@ source_urls = [
 ]
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python'
+configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python --with-zlib=$EBROOTZLIB'
 
 dependencies = [('zlib', '1.2.7')]
 
diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.8.0-ictce-4.1.13-Python-2.7.3.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.8.0-ictce-4.1.13-Python-2.7.3.eb
index cc27d1b86cc43eb6b057fe0d6ab24e319dae39a0..31e824b5ea47acbaa1108c2d55569539d9a1a051 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.8.0-ictce-4.1.13-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.8.0-ictce-4.1.13-Python-2.7.3.eb
@@ -14,7 +14,7 @@ source_urls = [
 ]
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = 'CC="$CC" CXX="$CXX" --with-pic'
+configopts = 'CC="$CC" CXX="$CXX" --with-pic --with-zlib=$EBROOTZLIB'
 
 pythonver = '2.7.3'
 pythonshortver = '.'.join(pythonver.split('.')[0:2])
diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.8.0-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.8.0-ictce-5.3.0-Python-2.7.3.eb
index 61308782eab7c3427905204f4a037876877d997b..5a92ef8bcb6c45abb4b30d473c350bbe58df8c0e 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.8.0-ictce-5.3.0-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.8.0-ictce-5.3.0-Python-2.7.3.eb
@@ -14,7 +14,7 @@ source_urls = [
 ]
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = 'CC="$CC" CXX="$CXX" --with-pic'
+configopts = 'CC="$CC" CXX="$CXX" --with-pic --with-zlib=$EBROOTZLIB'
 
 pythonver = '2.7.3'
 pythonshortver = '.'.join(pythonver.split('.')[0:2])
diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.8.0-ictce-5.3.0.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.8.0-ictce-5.3.0.eb
index fd2903059061bae94f2c54a257b375e840474d07..98b15d6f97412023622f8b60ec1e4026c2e5f2bc 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.8.0-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.8.0-ictce-5.3.0.eb
@@ -16,7 +16,7 @@ source_urls = [
 ]
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python'
+configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python --with-zlib=$EBROOTZLIB'
 
 dependencies = [('zlib', '1.2.7')]
 
diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.8.0-intel-2015a-Python-2.7.3.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.8.0-intel-2015a-Python-2.7.3.eb
index 81d93bf45c69c9ee593472861f54996f73973656..3f185c7e6d12585f91d9a7e745b987de5b7a23d9 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.8.0-intel-2015a-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.8.0-intel-2015a-Python-2.7.3.eb
@@ -14,7 +14,7 @@ source_urls = [
 ]
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = 'CC="$CC" CXX="$CXX" --with-pic'
+configopts = 'CC="$CC" CXX="$CXX" --with-pic --with-zlib=$EBROOTZLIB'
 
 pythonver = '2.7.3'
 pythonshortver = '.'.join(pythonver.split('.')[0:2])
diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.0-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.0-goalf-1.1.0-no-OFED.eb
index 8a4a61220f80dd7fcce440b463c4870620a4103c..0567c075f0559a02c44f88d45f7cba387fc5f747 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.0-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.0-goalf-1.1.0-no-OFED.eb
@@ -16,7 +16,7 @@ source_urls = [
 ]
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python'
+configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python --with-zlib=$EBROOTZLIB'
 
 dependencies = [('zlib', '1.2.7')]
 
diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.0-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.0-goolf-1.4.10.eb
index 0aa0c139866e39b97c5030727c4b009313ec9873..ee43d716e22326706f520952b966791780ce6699 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.0-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.0-goolf-1.4.10.eb
@@ -15,7 +15,7 @@ source_urls = [
 ]
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python'
+configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python --with-zlib=$EBROOTZLIB'
 
 dependencies = [('zlib', '1.2.7')]
 
diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.0-ictce-4.0.6.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.0-ictce-4.0.6.eb
index b1af1bc74e30c625ea5e3a3ec1bbbca45bec51cf..06cdc26c7679d6dfc012fc3f827214ac9702c50a 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.0-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.0-ictce-4.0.6.eb
@@ -16,7 +16,7 @@ source_urls = [
 ]
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python'
+configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python --with-zlib=$EBROOTZLIB'
 
 dependencies = [('zlib', '1.2.7')]
 
diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.0-ictce-4.1.13.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.0-ictce-4.1.13.eb
index 1364db9fd87fc0b7382617aa588d540df1e7d01c..3042a3cf37e83d5e1ec178f26e4a0c42bd539b99 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.0-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.0-ictce-4.1.13.eb
@@ -16,7 +16,7 @@ source_urls = [
 ]
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python'
+configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python --with-zlib=$EBROOTZLIB'
 
 dependencies = [('zlib', '1.2.7')]
 
diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.0-ictce-5.3.0.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.0-ictce-5.3.0.eb
index c35a6e9fc3272268839f18a0e6991a1a0f29f36b..f0aa6dee9cb24a65f7885798ea62e7ae936da42e 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.0-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.0-ictce-5.3.0.eb
@@ -16,7 +16,7 @@ source_urls = [
 ]
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python'
+configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python --with-zlib=$EBROOTZLIB'
 
 dependencies = [('zlib', '1.2.7')]
 
diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-gmpolf-1.4.8.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-gmpolf-1.4.8.eb
index 60a6e144044ed474faa82795e186ba4b5edbda91..33b6562e0fa336106df8fbd81e6b9f53227a9865 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-gmpolf-1.4.8.eb
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-gmpolf-1.4.8.eb
@@ -16,7 +16,7 @@ source_urls = [
 ]
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python'
+configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python --with-zlib=$EBROOTZLIB'
 
 dependencies = [('zlib', '1.2.7')]
 
diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-goalf-1.1.0-no-OFED.eb
index b388d01bd846e65564e58c9c815576af026e60d0..e44ddd0d64ca5a953af7c2db67ae22180df00cad 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-goalf-1.1.0-no-OFED.eb
@@ -16,7 +16,7 @@ source_urls = [
 ]
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python'
+configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python --with-zlib=$EBROOTZLIB'
 
 dependencies = [('zlib', '1.2.7')]
 
diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-goalf-1.5.12-no-OFED.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-goalf-1.5.12-no-OFED.eb
index f80ae7c225f3a87df048c4590d17d72b9ebb6a29..90b9bc8ea55a69d96978c8aeea8fe38b0163cec1 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-goalf-1.5.12-no-OFED.eb
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-goalf-1.5.12-no-OFED.eb
@@ -16,7 +16,7 @@ source_urls = [
 ]
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python'
+configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python --with-zlib=$EBROOTZLIB'
 
 dependencies = [('zlib', '1.2.8')]
 
diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-gompi-1.4.12-no-OFED.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-gompi-1.4.12-no-OFED.eb
index 6bb7068cf9e7f3ef61960fbc1297f713d0abef9a..487bf333ac32b6b12eb55d846e3619b50562435b 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-gompi-1.4.12-no-OFED.eb
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-gompi-1.4.12-no-OFED.eb
@@ -16,7 +16,7 @@ source_urls = [
 ]
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python'
+configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python --with-zlib=$EBROOTZLIB'
 
 dependencies = [('zlib', '1.2.7')]
 
diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-goolf-1.4.10.eb
index 2382dbbd475d2db986e2990bdb30032e051e3643..544880545882f3f6c20049a7865e12751323e67b 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-goolf-1.4.10.eb
@@ -16,7 +16,7 @@ source_urls = [
 ]
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python'
+configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python --with-zlib=$EBROOTZLIB'
 
 dependencies = [('zlib', '1.2.7')]
 
diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-goolf-1.5.14.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-goolf-1.5.14.eb
index 72ae920157941d0818ea4be1ef4b7866d4f075e4..b09000568f8db517f296a5991790e8657ed87348 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-goolf-1.5.14.eb
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-goolf-1.5.14.eb
@@ -16,7 +16,7 @@ source_urls = [
 ]
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python'
+configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python --with-zlib=$EBROOTZLIB'
 
 dependencies = [('zlib', '1.2.7')]
 
diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-ictce-4.0.6.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-ictce-4.0.6.eb
index 8a603988658ff3241a2cd067ad2cd5ce91d61167..3e1cc777901a9cc7426ec2e6fb60fba31a39bff0 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-ictce-4.0.6.eb
@@ -16,7 +16,7 @@ source_urls = [
 ]
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python'
+configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python --with-zlib=$EBROOTZLIB'
 
 dependencies = [('zlib', '1.2.7')]
 
diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-ictce-4.1.13.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-ictce-4.1.13.eb
index a2720d5e9b7bfe8beb4a04ef129e8af3bf1a3b41..5da629883240603b8ec01e430b14bc98e9c84afd 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-ictce-4.1.13.eb
@@ -16,7 +16,7 @@ source_urls = [
 ]
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python'
+configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python --with-zlib=$EBROOTZLIB'
 
 dependencies = [('zlib', '1.2.7')]
 
diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-ictce-5.2.0.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-ictce-5.2.0.eb
index 1c1b880f5686863e1610f80479c2a2cdfae9e948..aa7e4b1f778e00617c3d95c2057846db16512f20 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-ictce-5.2.0.eb
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-ictce-5.2.0.eb
@@ -16,7 +16,7 @@ source_urls = [
 ]
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python'
+configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python --with-zlib=$EBROOTZLIB'
 
 dependencies = [('zlib', '1.2.7')]
 
diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-ictce-5.3.0.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-ictce-5.3.0.eb
index 90f80b28047800acdb28ee0cec52a99e9cebf14b..e50f08d5e37560069cdf6158b737748924811bab 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-ictce-5.3.0.eb
@@ -16,7 +16,7 @@ source_urls = [
 ]
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python'
+configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python --with-zlib=$EBROOTZLIB'
 
 dependencies = [('zlib', '1.2.7')]
 
diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-ictce-5.5.0-Python-2.7.6.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-ictce-5.5.0-Python-2.7.6.eb
index 449f38ddfbcdf43c2ae0713cf82168ef5ae6a6fe..9d4e84392a22f9d5a177706e700433ffbc5069c9 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-ictce-5.5.0-Python-2.7.6.eb
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-ictce-5.5.0-Python-2.7.6.eb
@@ -14,7 +14,7 @@ source_urls = [
 ]
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = 'CC="$CC" CXX="$CXX" --with-pic'
+configopts = 'CC="$CC" CXX="$CXX" --with-pic --with-zlib=$EBROOTZLIB'
 
 pythonver = '2.7.6'
 pythonshortver = '.'.join(pythonver.split('.')[0:2])
diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-ictce-5.5.0.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-ictce-5.5.0.eb
index 118fae1f4c2930f495cc4056eae79c5acc214dc6..0cdacffa3af6fd2ec1e7825282e6488f47af531b 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-ictce-5.5.0.eb
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-ictce-5.5.0.eb
@@ -16,7 +16,7 @@ source_urls = [
 ]
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python'
+configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python --with-zlib=$EBROOTZLIB'
 
 dependencies = [('zlib', '1.2.8')]
 
diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-ictce-7.1.2.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-ictce-7.1.2.eb
index 615b01f264f3cef0016fd75acba3f9e2235fa886..ca67a911c12c9b5c5244a06bb8a459740ceb6bcd 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-ictce-7.1.2.eb
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-ictce-7.1.2.eb
@@ -17,7 +17,7 @@ source_urls = [
 ]
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python'
+configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python --with-zlib=$EBROOTZLIB'
 
 dependencies = [('zlib', '1.2.8')]
 
diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-intel-2014b.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-intel-2014b.eb
index 222bbd19cd6006d57271236510e7bc0dc721b0de..c6335dd8b2f74a716215ae7f98f6becd3cae7cdb 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-intel-2014b.eb
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-intel-2014b.eb
@@ -17,7 +17,7 @@ source_urls = [
 ]
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python'
+configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python --with-zlib=$EBROOTZLIB'
 
 dependencies = [('zlib', '1.2.8')]
 
diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-GCC-4.9.2.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-GCC-4.9.2.eb
index 7575c86f51806e80ddc1536622cf70ef694444e2..841eddc11e74280cdfe8eeebfe8c230067635006 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-GCC-4.9.2.eb
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-GCC-4.9.2.eb
@@ -17,7 +17,7 @@ source_urls = [
 ]
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python'
+configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python --with-zlib=$EBROOTZLIB'
 
 dependencies = [('zlib', '1.2.8')]
 
diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-GCC-4.9.3-2.25.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-GCC-4.9.3-2.25.eb
index 01f5647249055580799bda80af81e276a56573ef..8d892b499fd15242aee8ba21b4c92f8a434cf7df 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-GCC-4.9.3-2.25.eb
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-GCC-4.9.3-2.25.eb
@@ -17,7 +17,7 @@ source_urls = [
 ]
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python'
+configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python --with-zlib=$EBROOTZLIB'
 
 dependencies = [('zlib', '1.2.8')]
 
diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-GNU-4.9.3-2.25.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-GNU-4.9.3-2.25.eb
index 9bdf731db36d54f1f5803b0472c3205c8e7a9ac7..3c33fb41dada3f6026c6e84977b08a46bda80cb2 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-GNU-4.9.3-2.25.eb
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-GNU-4.9.3-2.25.eb
@@ -16,7 +16,7 @@ source_urls = [
 ]
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python'
+configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python --with-zlib=$EBROOTZLIB'
 
 dependencies = [('zlib', '1.2.8')]
 
diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-foss-2015a.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-foss-2015a.eb
index 541ab91f1b7a522a2b8fc841a78c234382cc062d..ae39cc8c24a233b63d52b459e44d9d655fcce23c 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-foss-2015a.eb
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-foss-2015a.eb
@@ -17,7 +17,7 @@ source_urls = [
 ]
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python'
+configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python --with-zlib=$EBROOTZLIB'
 
 dependencies = [('zlib', '1.2.8')]
 
diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-foss-2015b.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-foss-2015b.eb
index 8fd891d71abdff98a9b5f335eca7bfef058afafc..ad02e51c2e0b8cc8fde45590554164500bb40d2c 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-foss-2015b.eb
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-foss-2015b.eb
@@ -17,7 +17,7 @@ source_urls = [
 ]
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python'
+configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python --with-zlib=$EBROOTZLIB'
 
 dependencies = [('zlib', '1.2.8')]
 
diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-goolf-1.5.14.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-goolf-1.5.14.eb
index 9d5d34d98e8576a2d905a0c31b030f1eb053e275..f232e382c068930ef87c3117dfc1502063d04f79 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-goolf-1.5.14.eb
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-goolf-1.5.14.eb
@@ -17,7 +17,7 @@ source_urls = [
 ]
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python'
+configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python --with-zlib=$EBROOTZLIB'
 
 dependencies = [('zlib', '1.2.8')]
 
diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-goolf-1.7.20.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-goolf-1.7.20.eb
index aa5618634da7d3f2c05dda7a953333a5a4099a43..22d8c149d6182236593bddd12650e24ac05c118c 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-goolf-1.7.20.eb
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-goolf-1.7.20.eb
@@ -17,7 +17,7 @@ source_urls = [
 ]
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python'
+configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python --with-zlib=$EBROOTZLIB'
 
 dependencies = [('zlib', '1.2.8')]
 
diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-intel-2014.06.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-intel-2014.06.eb
index fe435074c91c4e4161d75d552795ae479c07d643..acdd85b6e6aace5c28f4aebde20699524ac346f3 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-intel-2014.06.eb
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-intel-2014.06.eb
@@ -17,7 +17,7 @@ source_urls = [
 ]
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python'
+configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python --with-zlib=$EBROOTZLIB'
 
 dependencies = [('zlib', '1.2.8')]
 
diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-intel-2014b.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-intel-2014b.eb
index 7f753229e09f89aaa82f596532f320a38be2e5b9..22aefe7d0cda545af8245c0aa775c2cfe7e636d8 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-intel-2014b.eb
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-intel-2014b.eb
@@ -17,7 +17,7 @@ source_urls = [
 ]
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python'
+configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python --with-zlib=$EBROOTZLIB'
 
 dependencies = [('zlib', '1.2.8')]
 
diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-intel-2015a-Python-2.7.10.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-intel-2015a-Python-2.7.10.eb
index e102ff79f513a26a4e0fa66f6605b8a3e51658eb..37724f23f1b4a7ba85174a824f4ffa561c475639 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-intel-2015a-Python-2.7.10.eb
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-intel-2015a-Python-2.7.10.eb
@@ -14,7 +14,7 @@ source_urls = [
 ]
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = 'CC="$CC" CXX="$CXX" --with-pic'
+configopts = 'CC="$CC" CXX="$CXX" --with-pic --with-zlib=$EBROOTZLIB'
 
 pythonver = '2.7.10'
 pythonshortver = '.'.join(pythonver.split('.')[0:2])
diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-intel-2015a-Python-2.7.9.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-intel-2015a-Python-2.7.9.eb
index da831a62f319b4e41021d03e5ea392741029a2b1..307b1793d4b0e1a6358aa8a2629b6df694701eee 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-intel-2015a-Python-2.7.9.eb
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-intel-2015a-Python-2.7.9.eb
@@ -14,7 +14,7 @@ source_urls = [
 ]
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = 'CC="$CC" CXX="$CXX" --with-pic'
+configopts = 'CC="$CC" CXX="$CXX" --with-pic --with-zlib=$EBROOTZLIB'
 
 pythonver = '2.7.9'
 pythonshortver = '.'.join(pythonver.split('.')[0:2])
diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-intel-2015a.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-intel-2015a.eb
index f49980dfe330a68a7b820c043f44d7174fec7d41..1a4f4c99c405566e2a75e7207a9e9cae081db8f7 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-intel-2015a.eb
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-intel-2015a.eb
@@ -17,7 +17,7 @@ source_urls = [
 ]
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python'
+configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python --with-zlib=$EBROOTZLIB'
 
 dependencies = [('zlib', '1.2.8')]
 
diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-intel-2015b.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-intel-2015b.eb
index b18959ba9738d8cb6563d003936450b8c1a98cb5..b95f92dfd972c2ab5f1dc8c34d76ca2032849a8a 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-intel-2015b.eb
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-intel-2015b.eb
@@ -17,7 +17,7 @@ source_urls = [
 ]
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python'
+configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python --with-zlib=$EBROOTZLIB'
 
 dependencies = [('zlib', '1.2.8')]
 
diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.3-foss-2015a-Python-2.7.11.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.3-foss-2015a-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..6cafc86e4f1dfbfc33ad5c06b6c66069a96293bc
--- /dev/null
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.3-foss-2015a-Python-2.7.11.eb
@@ -0,0 +1,28 @@
+name = 'libxml2'
+version = '2.9.3'
+
+homepage = 'http://xmlsoft.org/'
+description = """Libxml2 is the XML C parser and toolchain developed for the Gnome project (but usable
+ outside of the Gnome platform)."""
+
+toolchain = {'name': 'foss', 'version': '2015a'}
+toolchainopts = {'pic': True}
+
+source_urls = [
+    'http://xmlsoft.org/sources/',
+    'http://xmlsoft.org/sources/old/'
+]
+sources = [SOURCELOWER_TAR_GZ]
+
+configopts = 'CC="$CC" CXX="$CXX" --with-pic --with-zlib=$EBROOTZLIB'
+
+pythonver = '2.7.11'
+pythonshortver = '.'.join(pythonver.split('.')[:2])
+versionsuffix = '-%s-%s' % ('Python', pythonver)
+
+dependencies = [
+    ('zlib', '1.2.8'),
+    ('Python', pythonver),
+]
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.3-goolf-1.7.20.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.3-goolf-1.7.20.eb
new file mode 100644
index 0000000000000000000000000000000000000000..66513c188bb1828608c819f54afe2890174c8cbb
--- /dev/null
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.3-goolf-1.7.20.eb
@@ -0,0 +1,29 @@
+easyblock = 'ConfigureMake'
+
+name = 'libxml2'
+version = '2.9.3'
+
+homepage = 'http://xmlsoft.org/'
+description = """Libxml2 is the XML C parser and 
+toolchain developed for the Gnome project
+ (but usable outside of the Gnome platform)."""
+
+toolchain = {'name': 'goolf', 'version': '1.7.20'}
+toolchainopts = {'pic': True}
+
+source_urls = [
+    'http://xmlsoft.org/sources/',
+    'http://xmlsoft.org/sources/old/'
+]
+sources = [SOURCELOWER_TAR_GZ]
+
+configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python --with-zlib=$EBROOTZLIB'
+
+dependencies = [('zlib', '1.2.8')]
+
+sanity_check_paths = {
+    'files': [('lib/libxml2.a', 'lib64/libxml2.a'), ('lib/libxml2.%s' % SHLIB_EXT, 'lib64/libxml2.%s' % SHLIB_EXT)],
+    'dirs': ['bin', 'include/libxml2/libxml'],
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.3-intel-2015b-Python-2.7.10.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.3-intel-2015b-Python-2.7.10.eb
index 51c493e7e028e2884739c8ef8963da374ec2c12c..34777c9cc6854fe24010d28e50f4775ff509cd8b 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.3-intel-2015b-Python-2.7.10.eb
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.3-intel-2015b-Python-2.7.10.eb
@@ -14,7 +14,7 @@ source_urls = [
 ]
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = 'CC="$CC" CXX="$CXX" --with-pic'
+configopts = 'CC="$CC" CXX="$CXX" --with-pic --with-zlib=$EBROOTZLIB'
 
 pythonver = '2.7.10'
 pythonshortver = '.'.join(pythonver.split('.')[0:2])
diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.3-intel-2015b-Python-2.7.11.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.3-intel-2015b-Python-2.7.11.eb
index 61e0b9ca786c6b92e407007d77c36152edcee441..b28071061aede91e38954f4b53595cce896a95b2 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.3-intel-2015b-Python-2.7.11.eb
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.3-intel-2015b-Python-2.7.11.eb
@@ -14,7 +14,7 @@ source_urls = [
 ]
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = 'CC="$CC" CXX="$CXX" --with-pic'
+configopts = 'CC="$CC" CXX="$CXX" --with-pic --with-zlib=$EBROOTZLIB'
 
 pythonver = '2.7.11'
 pythonshortver = '.'.join(pythonver.split('.')[:2])
diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.3-intel-2016a-Python-2.7.11.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.3-intel-2016a-Python-2.7.11.eb
index 41e4fc099efca78d87e9853e2fd3f191a333df17..41e2af0e98c1c7b46d1cfb791bef67d5eb1eacd6 100644
--- a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.3-intel-2016a-Python-2.7.11.eb
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.3-intel-2016a-Python-2.7.11.eb
@@ -14,7 +14,7 @@ source_urls = [
 ]
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = 'CC="$CC" CXX="$CXX" --with-pic'
+configopts = 'CC="$CC" CXX="$CXX" --with-pic --with-zlib=$EBROOTZLIB'
 
 pyver = '2.7.11'
 pyshortver = '.'.join(pyver.split('.')[:2])
diff --git a/easybuild/easyconfigs/l/libxslt/libxslt-1.1.28-intel-2015b-Python-2.7.11.eb b/easybuild/easyconfigs/l/libxslt/libxslt-1.1.28-intel-2015b-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..8b441173325be6b3c2d026cd5e92cba537c09b23
--- /dev/null
+++ b/easybuild/easyconfigs/l/libxslt/libxslt-1.1.28-intel-2015b-Python-2.7.11.eb
@@ -0,0 +1,25 @@
+easyblock = 'ConfigureMake'
+
+name = 'libxslt'
+version = '1.1.28'
+versionsuffix = '-Python-2.7.11'
+
+homepage = 'http://xmlsoft.org/'
+description = """Libxslt is the XSLT C library developed for the GNOME project
+ (but usable outside of the Gnome platform)."""
+
+toolchain = {'name': 'intel', 'version': '2015b'}
+
+source_urls = [
+    'http://xmlsoft.org/sources/',
+    'http://xmlsoft.org/sources/old/'
+]
+
+sources = [SOURCELOWER_TAR_GZ]
+
+dependencies = [
+    ('zlib', '1.2.8'),
+    ('libxml2', '2.9.3', versionsuffix),
+]
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/likwid/likwid-3.0.0-goalf-1.1.0-no-OFED-pinomp.eb b/easybuild/easyconfigs/l/likwid/likwid-3.0.0-goalf-1.1.0-no-OFED-pinomp.eb
index e17929c01baa3e90805134686e69dd1bedc5aaad..132721bab520e6e57a334e120f190956a4569a7b 100644
--- a/easybuild/easyconfigs/l/likwid/likwid-3.0.0-goalf-1.1.0-no-OFED-pinomp.eb
+++ b/easybuild/easyconfigs/l/likwid/likwid-3.0.0-goalf-1.1.0-no-OFED-pinomp.eb
@@ -16,13 +16,13 @@ source_urls = [GOOGLECODE_SOURCE]
 patches = ['pinomp-pthread-overload.patch']
 
 skipsteps = ['configure']
-buildopts='CC="$CC" CFLAGS="$CFLAGS"'
+buildopts = 'CC="$CC" CFLAGS="$CFLAGS"'
 installopts = 'PREFIX=%(installdir)s'
 
 sanity_check_paths = {
     'files': ["bin/likwid-features", "bin/likwid-memsweeper", "bin/likwid-mpirun", "bin/likwid-perfctr",
               "bin/likwid-perfscope", "bin/likwid-pin", "bin/likwid-powermeter", "bin/likwid-topology",
-              "lib/liblikwidpin.%s" % SHLIB_EXT , "lib/liblikwid.a"],
+              "lib/liblikwidpin.%s" % SHLIB_EXT, "lib/liblikwid.a"],
     'dirs': ["man/man1"]
 }
 
diff --git a/easybuild/easyconfigs/l/likwid/likwid-3.0.0-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/l/likwid/likwid-3.0.0-goalf-1.1.0-no-OFED.eb
index 9d0cf1054d24421b39ec74a1176cb5d28646ec4a..669fa552aa532219ebace577134647af6b68f13d 100644
--- a/easybuild/easyconfigs/l/likwid/likwid-3.0.0-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/l/likwid/likwid-3.0.0-goalf-1.1.0-no-OFED.eb
@@ -13,7 +13,7 @@ sources = [SOURCE_TAR_GZ]
 source_urls = [GOOGLECODE_SOURCE]
 
 skipsteps = ['configure']
-buildopts='CC="$CC" CFLAGS="$CFLAGS"'
+buildopts = 'CC="$CC" CFLAGS="$CFLAGS"'
 installopts = 'PREFIX=%(installdir)s'
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/l/likwid/likwid-3.0.0-goolf-1.4.10-pinomp.eb b/easybuild/easyconfigs/l/likwid/likwid-3.0.0-goolf-1.4.10-pinomp.eb
index 3855b155c5c34735be4a1ef7f3e8fb99e27c85cf..0c0b62a221b1cba8e9e160829866d48a1c6076c0 100644
--- a/easybuild/easyconfigs/l/likwid/likwid-3.0.0-goolf-1.4.10-pinomp.eb
+++ b/easybuild/easyconfigs/l/likwid/likwid-3.0.0-goolf-1.4.10-pinomp.eb
@@ -16,13 +16,13 @@ source_urls = [GOOGLECODE_SOURCE]
 patches = ['pinomp-pthread-overload.patch']
 
 skipsteps = ['configure']
-buildopts='CC="$CC" CFLAGS="$CFLAGS"'
+buildopts = 'CC="$CC" CFLAGS="$CFLAGS"'
 installopts = 'PREFIX=%(installdir)s'
 
 sanity_check_paths = {
     'files': ["bin/likwid-features", "bin/likwid-memsweeper", "bin/likwid-mpirun", "bin/likwid-perfctr",
               "bin/likwid-perfscope", "bin/likwid-pin", "bin/likwid-powermeter", "bin/likwid-topology",
-              "lib/liblikwidpin.%s" % SHLIB_EXT , "lib/liblikwid.a"],
+              "lib/liblikwidpin.%s" % SHLIB_EXT, "lib/liblikwid.a"],
     'dirs': ["man/man1"]
 }
 
diff --git a/easybuild/easyconfigs/l/likwid/likwid-3.0.0-goolf-1.4.10.eb b/easybuild/easyconfigs/l/likwid/likwid-3.0.0-goolf-1.4.10.eb
index 8d8e1a8a561fb8a11c0b870cc228ed3476ce751c..ec93432ba45496d74addac73cc3ba094f3e10ba0 100644
--- a/easybuild/easyconfigs/l/likwid/likwid-3.0.0-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/l/likwid/likwid-3.0.0-goolf-1.4.10.eb
@@ -13,7 +13,7 @@ sources = [SOURCE_TAR_GZ]
 source_urls = [GOOGLECODE_SOURCE]
 
 skipsteps = ['configure']
-buildopts='CC="$CC" CFLAGS="$CFLAGS"'
+buildopts = 'CC="$CC" CFLAGS="$CFLAGS"'
 installopts = 'PREFIX=%(installdir)s'
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/l/likwid/likwid-3.0.0-ictce-4.1.13-pinomp.eb b/easybuild/easyconfigs/l/likwid/likwid-3.0.0-ictce-4.1.13-pinomp.eb
index 2933d462674a127dd5f93587a6b3a83099e4c3f2..e4ad87b3072238ae0333aeab98c56906b1aaf7fc 100644
--- a/easybuild/easyconfigs/l/likwid/likwid-3.0.0-ictce-4.1.13-pinomp.eb
+++ b/easybuild/easyconfigs/l/likwid/likwid-3.0.0-ictce-4.1.13-pinomp.eb
@@ -16,7 +16,7 @@ source_urls = [GOOGLECODE_SOURCE]
 patches = ['pinomp-pthread-overload.patch']
 
 skipsteps = ['configure']
-buildopts='CC="$CC" CFLAGS="$CFLAGS"'
+buildopts = 'CC="$CC" CFLAGS="$CFLAGS"'
 installopts = 'PREFIX=%(installdir)s'
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/l/likwid/likwid-3.0.0-ictce-4.1.13.eb b/easybuild/easyconfigs/l/likwid/likwid-3.0.0-ictce-4.1.13.eb
index 39f9e9f76b67403293362ea4b1453b9e827411e9..5861b6ec0ba9596a532ad111f6b6ac0745bff7e3 100644
--- a/easybuild/easyconfigs/l/likwid/likwid-3.0.0-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/l/likwid/likwid-3.0.0-ictce-4.1.13.eb
@@ -13,7 +13,7 @@ sources = [SOURCE_TAR_GZ]
 source_urls = [GOOGLECODE_SOURCE]
 
 skipsteps = ['configure']
-buildopts='CC="$CC" CFLAGS="$CFLAGS"'
+buildopts = 'CC="$CC" CFLAGS="$CFLAGS"'
 installopts = 'PREFIX=%(installdir)s'
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/l/likwid/likwid-3.0.0-ictce-5.3.0-pinomp.eb b/easybuild/easyconfigs/l/likwid/likwid-3.0.0-ictce-5.3.0-pinomp.eb
index 07a812856a3780205944cc85ba2187a38d5d62f6..8e3bb39ecc8a37e3860d02f53e8930a643169886 100644
--- a/easybuild/easyconfigs/l/likwid/likwid-3.0.0-ictce-5.3.0-pinomp.eb
+++ b/easybuild/easyconfigs/l/likwid/likwid-3.0.0-ictce-5.3.0-pinomp.eb
@@ -16,7 +16,7 @@ source_urls = [GOOGLECODE_SOURCE]
 patches = ['pinomp-pthread-overload.patch']
 
 skipsteps = ['configure']
-buildopts='CC="$CC" CFLAGS="$CFLAGS"'
+buildopts = 'CC="$CC" CFLAGS="$CFLAGS"'
 installopts = 'PREFIX=%(installdir)s'
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/l/likwid/likwid-3.0.0-ictce-5.3.0.eb b/easybuild/easyconfigs/l/likwid/likwid-3.0.0-ictce-5.3.0.eb
index 5202c650457ab798e1cdb43f7acaf01b0a84532b..38eedbb46e23be4b21d2c2b9616eb24fe3de85f8 100644
--- a/easybuild/easyconfigs/l/likwid/likwid-3.0.0-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/l/likwid/likwid-3.0.0-ictce-5.3.0.eb
@@ -13,7 +13,7 @@ sources = [SOURCE_TAR_GZ]
 source_urls = [GOOGLECODE_SOURCE]
 
 skipsteps = ['configure']
-buildopts='CC="$CC" CFLAGS="$CFLAGS"'
+buildopts = 'CC="$CC" CFLAGS="$CFLAGS"'
 installopts = 'PREFIX=%(installdir)s'
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/l/lxml/lxml-3.5.0-intel-2015b-Python-2.7.11.eb b/easybuild/easyconfigs/l/lxml/lxml-3.5.0-intel-2015b-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..c1b483c4c3a9c7ae29246ef05056b4d4cd65d95d
--- /dev/null
+++ b/easybuild/easyconfigs/l/lxml/lxml-3.5.0-intel-2015b-Python-2.7.11.eb
@@ -0,0 +1,30 @@
+easyblock = 'PythonPackage'
+
+name = 'lxml'
+version = '3.5.0'
+
+homepage = 'http://lxml.de/'
+description = """The lxml XML toolkit is a Pythonic binding for the C libraries libxml2 and libxslt."""
+
+toolchain = {'name': 'intel', 'version': '2015b'}
+
+source_urls = ['http://lxml.de/files/']
+sources = [SOURCE_TGZ]
+
+pyver = '2.7.11'
+pyshortver = '.'.join(pyver.split('.')[:2])
+
+versionsuffix = '-Python-%s' % pyver
+
+dependencies = [
+    ('Python', pyver),
+    ('libxml2', '2.9.3', versionsuffix),
+    ('libxslt', '1.1.28', versionsuffix),
+]
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%s/site-packages' % pyshortver],
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.16-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/m/M4/M4-1.4.16-goalf-1.1.0-no-OFED.eb
index 9ced23daf9efed0050dcb24cfaf76af167bf6f3b..e90e4b4187c482a745f069e6099ba55e6a69d03f 100644
--- a/easybuild/easyconfigs/m/M4/M4-1.4.16-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/m/M4/M4-1.4.16-goalf-1.1.0-no-OFED.eb
@@ -9,7 +9,7 @@ description = """GNU M4 is an implementation of the traditional Unix macro proce
   (for example, handling more than 9 positional parameters to macros).
  GNU M4 also has built-in functions for including files, running shell commands, doing arithmetic, etc."""
 
-toolchain = {'name': 'goalf', 'version' : '1.1.0-no-OFED'}
+toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
 
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = [GNU_SOURCE]
diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.17-foss-2015b.eb b/easybuild/easyconfigs/m/M4/M4-1.4.17-foss-2015b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..b66775c7a65ed48fb4d386435270650e7355355a
--- /dev/null
+++ b/easybuild/easyconfigs/m/M4/M4-1.4.17-foss-2015b.eb
@@ -0,0 +1,23 @@
+easyblock = 'ConfigureMake'
+
+name = 'M4'
+version = '1.4.17'
+
+homepage = 'http://www.gnu.org/software/m4/m4.html'
+description = """GNU M4 is an implementation of the traditional Unix macro processor. It is mostly SVR4 compatible
+  although it has some extensions (for example, handling more than 9 positional parameters to macros).
+ GNU M4 also has built-in functions for including files, running shell commands, doing arithmetic, etc."""
+
+toolchain = {'name': 'foss', 'version': '2015b'}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = [GNU_SOURCE]
+
+configopts = "--enable-cxx"
+
+sanity_check_paths = {
+    'files': ["bin/m4"],
+    'dirs': [],
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/m/MACS2/MACS2-2.1.0.20150731-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/m/MACS2/MACS2-2.1.0.20150731-goolf-1.4.10-Python-2.7.3.eb
index 5ab68f33556eb16e1193902e969cb3fb02dc11ea..74d5a36f68061da53233e8a7c768bb9742dfa6f0 100644
--- a/easybuild/easyconfigs/m/MACS2/MACS2-2.1.0.20150731-goolf-1.4.10-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/m/MACS2/MACS2-2.1.0.20150731-goolf-1.4.10-Python-2.7.3.eb
@@ -32,7 +32,7 @@ dependencies = [
     ('numpy', '1.7.1', versionsuffix),
 ]
 
-options = {'modulename': name }
+options = {'modulename': name}
 
 # specify that this asyblock should run a full sanity check, rather than just trying to load the module
 full_sanity_check = True
diff --git a/easybuild/easyconfigs/m/MAST/MAST-20160111-intel-2015b-R-3.2.1.eb b/easybuild/easyconfigs/m/MAST/MAST-20160111-intel-2015b-R-3.2.1.eb
new file mode 100644
index 0000000000000000000000000000000000000000..c085da3378d623f1d9d62964655f1fea5c143d30
--- /dev/null
+++ b/easybuild/easyconfigs/m/MAST/MAST-20160111-intel-2015b-R-3.2.1.eb
@@ -0,0 +1,25 @@
+easyblock = 'RPackage'
+
+name = 'MAST'
+version = '20160111'
+versionsuffix = '-R-%(rver)s'
+
+homepage = 'https://github.com/RGLab/MAST'
+description = """Tools and methods for analysis of single cell assay data in R"""
+
+toolchain = {'name': 'intel', 'version': '2015b'}
+
+source_urls = ['https://github.com/RGLab/MAST/archive/']
+sources = ['8234b18.tar.gz']
+
+dependencies = [
+    ('R', '3.2.1'),
+    ('R-bundle-Bioconductor', '3.1', versionsuffix),
+]
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['%(name)s'],
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/m/MATIO/MATIO-1.5.2-goolf-1.4.10.eb b/easybuild/easyconfigs/m/MATIO/MATIO-1.5.2-goolf-1.4.10.eb
index 79d3f53e5ad6a9edbab99b0717ef9196c15d60ff..2f00cc2dbdd56cbaccf6ec72909079dfa281ac5a 100644
--- a/easybuild/easyconfigs/m/MATIO/MATIO-1.5.2-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/m/MATIO/MATIO-1.5.2-goolf-1.4.10.eb
@@ -19,6 +19,6 @@ toolchain = {'name': 'goolf', 'version': '1.4.10'}
 source_urls = [SOURCEFORGE_SOURCE]
 sources = [SOURCELOWER_ZIP]
 
-dependencies = [('zlib','1.2.7')]
+dependencies = [('zlib', '1.2.7')]
 
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/m/MATLAB/MATLAB-2012b.eb b/easybuild/easyconfigs/m/MATLAB/MATLAB-2012b.eb
index 8deb5537516b3aa1c5af7ef29019d80799446441..ba3d36b9c7159b8d6dc38e2e7089dbba6a2aa404 100644
--- a/easybuild/easyconfigs/m/MATLAB/MATLAB-2012b.eb
+++ b/easybuild/easyconfigs/m/MATLAB/MATLAB-2012b.eb
@@ -10,7 +10,7 @@ toolchain = {'name': 'dummy', 'version': 'dummy'}
 
 sources = [SOURCELOWER_TAR_GZ]
 
-dependencies =[('Java', '1.7.0_10')]
+dependencies = [('Java', '1.7.0_10')]
 
 import os
 license_server = os.getenv('EB_MATLAB_LICENSE_SERVER', 'license.example.com')
diff --git a/easybuild/easyconfigs/m/MCL/MCL-12.135-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/m/MCL/MCL-12.135-goalf-1.1.0-no-OFED.eb
index 54d1c4d20bec738822a06108cd274a63747dcb38..e322ccb0af241ec05739c25e9f076ad72b111852 100644
--- a/easybuild/easyconfigs/m/MCL/MCL-12.135-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/m/MCL/MCL-12.135-goalf-1.1.0-no-OFED.eb
@@ -29,8 +29,8 @@ sources = ['mcl-%s.tar.gz' % '-'.join(version.split('.'))]
 source_urls = ['http://micans.org/mcl/src/']
 
 sanity_check_paths = {
-                      'files': ["bin/mcl"],
-                      'dirs': ["share"]
-                     }
+    'files': ["bin/mcl"],
+    'dirs': ["share"]
+}
 
 moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/m/MCL/MCL-12.135-goolf-1.4.10.eb b/easybuild/easyconfigs/m/MCL/MCL-12.135-goolf-1.4.10.eb
index 0b7a65ab006bf8fc5243daff1d0b8e4f07ba760d..b1a95f40315c0e5fe1ad6bc379d7ac39f988d91f 100644
--- a/easybuild/easyconfigs/m/MCL/MCL-12.135-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/m/MCL/MCL-12.135-goolf-1.4.10.eb
@@ -28,8 +28,8 @@ sources = ['mcl-%s.tar.gz' % '-'.join(version.split('.'))]
 source_urls = ['http://micans.org/mcl/src/']
 
 sanity_check_paths = {
-                      'files': ["bin/mcl"],
-                      'dirs': ["share"]
-                     }
+    'files': ["bin/mcl"],
+    'dirs': ["share"]
+}
 
 moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/m/MCL/MCL-12.135-ictce-4.0.6.eb b/easybuild/easyconfigs/m/MCL/MCL-12.135-ictce-4.0.6.eb
index b2dec05ab596833231db741b8e3fd3407cb4cf20..232ec42670f95dfab7498b4e02dc3523d62caea9 100644
--- a/easybuild/easyconfigs/m/MCL/MCL-12.135-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/m/MCL/MCL-12.135-ictce-4.0.6.eb
@@ -29,8 +29,8 @@ sources = ['mcl-%s.tar.gz' % '-'.join(version.split('.'))]
 source_urls = ['http://micans.org/mcl/src/']
 
 sanity_check_paths = {
-                      'files': ["bin/mcl"],
-                      'dirs': ["share"]
-                     }
+    'files': ["bin/mcl"],
+    'dirs': ["share"]
+}
 
 moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/m/MCL/MCL-12.135-ictce-4.1.13.eb b/easybuild/easyconfigs/m/MCL/MCL-12.135-ictce-4.1.13.eb
index 26b2a9bb86086571f18356fea47fc0b2f07bf3ae..3edc17b8e9ded09045ccad28077efa74d3e81ad3 100644
--- a/easybuild/easyconfigs/m/MCL/MCL-12.135-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/m/MCL/MCL-12.135-ictce-4.1.13.eb
@@ -29,8 +29,8 @@ sources = ['mcl-%s.tar.gz' % '-'.join(version.split('.'))]
 source_urls = ['http://micans.org/mcl/src/']
 
 sanity_check_paths = {
-                      'files': ["bin/mcl"],
-                      'dirs': ["share"]
-                     }
+    'files': ["bin/mcl"],
+    'dirs': ["share"]
+}
 
 moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/m/MCL/MCL-12.135-ictce-5.3.0.eb b/easybuild/easyconfigs/m/MCL/MCL-12.135-ictce-5.3.0.eb
index b84227a5587900147de9f0be13a575530de5a0b4..0619f29465bb1fd6c9f1f2677cc6aee95ff6b8c9 100644
--- a/easybuild/easyconfigs/m/MCL/MCL-12.135-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/m/MCL/MCL-12.135-ictce-5.3.0.eb
@@ -30,8 +30,8 @@ sources = ['mcl-%s.tar.gz' % '-'.join(version.split('.'))]
 source_urls = ['http://micans.org/mcl/src/']
 
 sanity_check_paths = {
-                      'files': ["bin/mcl"],
-                      'dirs': ["share"]
-                     }
+    'files': ["bin/mcl"],
+    'dirs': ["share"]
+}
 
 moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/m/MCR/MCR-R2014a.eb b/easybuild/easyconfigs/m/MCR/MCR-R2014a.eb
index 7efec1287d0f127808fe9078fdcfd5ff60230223..1c593f743064a381b10e8dcd361abe240ef475d4 100644
--- a/easybuild/easyconfigs/m/MCR/MCR-R2014a.eb
+++ b/easybuild/easyconfigs/m/MCR/MCR-R2014a.eb
@@ -8,9 +8,11 @@ description = """The MATLAB Runtime is a standalone set of shared libraries
 
 toolchain = {'name': 'dummy', 'version': 'dummy'}
 
-source_urls = ['http://www.mathworks.com/supportfiles/downloads/%(version)s/deployment_files/%(version)s/installers/glnxa64/']
+source_urls = [
+    'http://www.mathworks.com/supportfiles/downloads/%(version)s/deployment_files/%(version)s/installers/glnxa64/',
+]
 sources = ['%(name)s_%(version)s_glnxa64_installer.zip']
 
-dependencies =[('Java', '1.8.0_31')]
+dependencies = [('Java', '1.8.0_31')]
 
 moduleclass = 'math'
diff --git a/easybuild/easyconfigs/m/MCR/MCR-R2015a.eb b/easybuild/easyconfigs/m/MCR/MCR-R2015a.eb
index e0b5326bd60b3ce84d093900ae7237193704baf6..f459048eeb9810e2dfc7df43184553eef0974fe7 100644
--- a/easybuild/easyconfigs/m/MCR/MCR-R2015a.eb
+++ b/easybuild/easyconfigs/m/MCR/MCR-R2015a.eb
@@ -8,9 +8,11 @@ description = """The MATLAB Runtime is a standalone set of shared libraries
 
 toolchain = {'name': 'dummy', 'version': 'dummy'}
 
-source_urls = ['http://www.mathworks.com/supportfiles/downloads/%(version)s/deployment_files/%(version)s/installers/glnxa64/']
+source_urls = [
+    'http://www.mathworks.com/supportfiles/downloads/%(version)s/deployment_files/%(version)s/installers/glnxa64/',
+]
 sources = ['%(name)s_%(version)s_glnxa64_installer.zip']
 
-dependencies =[('Java', '1.8.0_31')]
+dependencies = [('Java', '1.8.0_31')]
 
 moduleclass = 'math'
diff --git a/easybuild/easyconfigs/m/METIS/METIS-5.1.0-foss-2016a-32bitIDX.eb b/easybuild/easyconfigs/m/METIS/METIS-5.1.0-foss-2016a-32bitIDX.eb
new file mode 100644
index 0000000000000000000000000000000000000000..b31636893425175c0626e9d5f71146301336ef8c
--- /dev/null
+++ b/easybuild/easyconfigs/m/METIS/METIS-5.1.0-foss-2016a-32bitIDX.eb
@@ -0,0 +1,23 @@
+name = 'METIS'
+version = '5.1.0'
+versionsuffix = '-32bitIDX'
+
+homepage = 'http://glaros.dtc.umn.edu/gkhome/metis/metis/overview'
+description = """METIS is a set of serial programs for partitioning graphs, partitioning finite element meshes,
+ and producing fill reducing orderings for sparse matrices. The algorithms implemented in METIS are based on the
+ multilevel recursive-bisection, multilevel k-way, and multi-constraint partitioning schemes."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+toolchainopts = {'optarch': True, 'pic': True}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = [
+    'http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis',
+    'http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis/OLD',
+]
+
+builddependencies = [('CMake', '3.4.3')]
+
+configopts = ['', 'shared=1']
+
+moduleclass = 'math'
diff --git a/easybuild/easyconfigs/m/METIS/METIS-5.1.0-foss-2016a.eb b/easybuild/easyconfigs/m/METIS/METIS-5.1.0-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..2b65f31212cfadb1691d0eb8d75c4f6fd63de460
--- /dev/null
+++ b/easybuild/easyconfigs/m/METIS/METIS-5.1.0-foss-2016a.eb
@@ -0,0 +1,22 @@
+name = 'METIS'
+version = '5.1.0'
+
+homepage = 'http://glaros.dtc.umn.edu/gkhome/metis/metis/overview'
+description = """METIS is a set of serial programs for partitioning graphs, partitioning finite element meshes,
+ and producing fill reducing orderings for sparse matrices. The algorithms implemented in METIS are based on the
+ multilevel recursive-bisection, multilevel k-way, and multi-constraint partitioning schemes."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+toolchainopts = {'optarch': True, 'pic': True}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = [
+    'http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis',
+    'http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis/OLD',
+]
+
+builddependencies = [('CMake', '3.4.3')]
+
+configopts = ['', 'shared=1']
+
+moduleclass = 'math'
diff --git a/easybuild/easyconfigs/m/METIS/METIS-5.1.0-gimkl-2.11.5-32bitIDX.eb b/easybuild/easyconfigs/m/METIS/METIS-5.1.0-gimkl-2.11.5-32bitIDX.eb
index 0d5b02189a2aa4812577b986995ddeced3a5dbea..7ab7bcbfae4962b6107e77e8e0ed7e6d3b2d20e3 100644
--- a/easybuild/easyconfigs/m/METIS/METIS-5.1.0-gimkl-2.11.5-32bitIDX.eb
+++ b/easybuild/easyconfigs/m/METIS/METIS-5.1.0-gimkl-2.11.5-32bitIDX.eb
@@ -1,6 +1,6 @@
 name = 'METIS'
 version = '5.1.0'
-#default 32-bit IDTYPEWIDTH, no patch used
+# default 32-bit IDTYPEWIDTH, no patch used
 versionsuffix = '-32bitIDX'
 
 homepage = 'http://glaros.dtc.umn.edu/gkhome/metis/metis/overview'
diff --git a/easybuild/easyconfigs/m/METIS/METIS-5.1.0-intel-2015a-32bitIDX.eb b/easybuild/easyconfigs/m/METIS/METIS-5.1.0-intel-2015a-32bitIDX.eb
index d937f515a841702f0a67dbc1a80dbd8d274b52f9..b404314c3ee7bfdb11c21ddd21d2a79d198c81e6 100644
--- a/easybuild/easyconfigs/m/METIS/METIS-5.1.0-intel-2015a-32bitIDX.eb
+++ b/easybuild/easyconfigs/m/METIS/METIS-5.1.0-intel-2015a-32bitIDX.eb
@@ -1,6 +1,6 @@
 name = 'METIS'
 version = '5.1.0'
-#default 32-bit IDTYPEWIDTH, no patch used
+# default 32-bit IDTYPEWIDTH, no patch used
 versionsuffix = '-32bitIDX'
 
 homepage = 'http://glaros.dtc.umn.edu/gkhome/metis/metis/overview'
diff --git a/easybuild/easyconfigs/m/METIS/METIS-5.1.0-intel-2015b-32bitIDX.eb b/easybuild/easyconfigs/m/METIS/METIS-5.1.0-intel-2015b-32bitIDX.eb
index c9b8dd3d53f325462d8b358044c6727ef2a2de7d..9810c2e1f284928342e531e2290f39e25e0b8e15 100644
--- a/easybuild/easyconfigs/m/METIS/METIS-5.1.0-intel-2015b-32bitIDX.eb
+++ b/easybuild/easyconfigs/m/METIS/METIS-5.1.0-intel-2015b-32bitIDX.eb
@@ -1,6 +1,6 @@
 name = 'METIS'
 version = '5.1.0'
-#default 32-bit IDTYPEWIDTH, no patch used
+# default 32-bit IDTYPEWIDTH, no patch used
 versionsuffix = '-32bitIDX'
 
 homepage = 'http://glaros.dtc.umn.edu/gkhome/metis/metis/overview'
diff --git a/easybuild/easyconfigs/m/MLC/MLC-3.0.eb b/easybuild/easyconfigs/m/MLC/MLC-3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..6f9d7320eaedd0df1953c035ef2cad3fd0f1d450
--- /dev/null
+++ b/easybuild/easyconfigs/m/MLC/MLC-3.0.eb
@@ -0,0 +1,23 @@
+easyblock = 'Tarball'
+
+name = 'MLC'
+version = '3.0'
+
+homepage = 'https://software.intel.com/en-us/articles/intelr-memory-latency-checker'
+description = """Intel Memory Latency Checker (Intel MLC) is a tool used to measure memory latencies and b/w,
+ and how they change with increasing load on the system."""
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+# download requires agreeing to license
+# https://software.intel.com/en-us/articles/intelr-memory-latency-checker#download
+sources = ['mlcv3.0.tgz']
+
+sanity_check_paths = {
+    'files': ['Linux/mlc', 'Linux/mlc_avx512', 'mlc_license.txt', 'readme.pdf'],
+    'dirs': [],
+}
+
+modextrapaths = {'PATH': 'Linux'}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/m/MMSEQ/MMSEQ-1.0.8-linux64-static.eb b/easybuild/easyconfigs/m/MMSEQ/MMSEQ-1.0.8-linux64-static.eb
index e59bc4367084df74c0cf8d2f9ba8cb3c2eb99e3f..9077537b1d06cf800724f603dea02c31f42bd2ae 100644
--- a/easybuild/easyconfigs/m/MMSEQ/MMSEQ-1.0.8-linux64-static.eb
+++ b/easybuild/easyconfigs/m/MMSEQ/MMSEQ-1.0.8-linux64-static.eb
@@ -19,7 +19,7 @@ source_urls = ['https://github.com/eturro/mmseq/archive/']
 sources = ['%(version)s.tar.gz']
 
 sanity_check_paths = {
-    'files': ["bin/mmseq-linux", "bin/bam2hits-linux", "bin/extract_transcripts-linux" ],
+    'files': ["bin/mmseq-linux", "bin/bam2hits-linux", "bin/extract_transcripts-linux"],
     'dirs': []
 }
 
diff --git a/easybuild/easyconfigs/m/MPC/MPC-1.0.2-intel-2015a.eb b/easybuild/easyconfigs/m/MPC/MPC-1.0.2-intel-2015a.eb
index 6763501bb444ca0ca2ebca3d88b66f55c2822290..191f33c7254a3f0401483f2e6de13a1ed60a9b50 100644
--- a/easybuild/easyconfigs/m/MPC/MPC-1.0.2-intel-2015a.eb
+++ b/easybuild/easyconfigs/m/MPC/MPC-1.0.2-intel-2015a.eb
@@ -25,6 +25,6 @@ runtest = 'check'
 sanity_check_paths = {
     'files': ['lib/libmpc.%s' % SHLIB_EXT, 'include/mpc.h'],
     'dirs': []
-                     }
+}
 
 moduleclass = 'math'
diff --git a/easybuild/easyconfigs/m/MPFR/MPFR-3.1.2-foss-2015a-GMP-6.0.0a.eb b/easybuild/easyconfigs/m/MPFR/MPFR-3.1.2-foss-2015a-GMP-6.0.0a.eb
index c0d8ea5a4855626565738cd1a3b91cd3781f4c53..d500bd8bd384511f0ca8b67aeefad84aefacc448 100644
--- a/easybuild/easyconfigs/m/MPFR/MPFR-3.1.2-foss-2015a-GMP-6.0.0a.eb
+++ b/easybuild/easyconfigs/m/MPFR/MPFR-3.1.2-foss-2015a-GMP-6.0.0a.eb
@@ -14,11 +14,11 @@ sources = [SOURCELOWER_TAR_BZ2]
 
 patches = ['MPFR_ictce_remove-deprecated-mp.patch']
 
-gmp='GMP'
-gmpver='6.0.0a'
-versionsuffix='-%s-%s' % (gmp,gmpver)
+gmp = 'GMP'
+gmpver = '6.0.0a'
+versionsuffix = '-%s-%s' % (gmp, gmpver)
 
-#GMP does not compile correctly with ICC on Haswell architecture
+# GMP does not compile correctly with ICC on Haswell architecture
 dependencies = [(gmp, gmpver, '', ('GCC', '4.9.2'))]
 
 runtest = 'check'
diff --git a/easybuild/easyconfigs/m/MPFR/MPFR-3.1.2-intel-2015a-GMP-6.0.0a.eb b/easybuild/easyconfigs/m/MPFR/MPFR-3.1.2-intel-2015a-GMP-6.0.0a.eb
index 4afd6ab5dcbbf3c162902a2aebe47808f8973563..ed339c9c95836b906c3c22d31475bd0f6f9dc532 100644
--- a/easybuild/easyconfigs/m/MPFR/MPFR-3.1.2-intel-2015a-GMP-6.0.0a.eb
+++ b/easybuild/easyconfigs/m/MPFR/MPFR-3.1.2-intel-2015a-GMP-6.0.0a.eb
@@ -14,11 +14,11 @@ sources = [SOURCELOWER_TAR_BZ2]
 
 patches = ['MPFR_ictce_remove-deprecated-mp.patch']
 
-gmp='GMP'
-gmpver='6.0.0a'
-versionsuffix='-%s-%s' % (gmp,gmpver)
+gmp = 'GMP'
+gmpver = '6.0.0a'
+versionsuffix = '-%s-%s' % (gmp, gmpver)
 
-#GMP does not compile correctly with ICC on Haswell architecture
+# GMP does not compile correctly with ICC on Haswell architecture
 dependencies = [(gmp, gmpver, '', ('GCC', '4.9.2'))]
 
 runtest = 'check'
diff --git a/easybuild/easyconfigs/m/MPJ-Express/MPJ-Express-0.44-goolf-1.4.10-Java-1.7.0_75.eb b/easybuild/easyconfigs/m/MPJ-Express/MPJ-Express-0.44-goolf-1.4.10-Java-1.7.0_75.eb
new file mode 100644
index 0000000000000000000000000000000000000000..25c03b4120b295fbdac1c9082800e66e3d9c72b5
--- /dev/null
+++ b/easybuild/easyconfigs/m/MPJ-Express/MPJ-Express-0.44-goolf-1.4.10-Java-1.7.0_75.eb
@@ -0,0 +1,48 @@
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+# Author: Pablo Escobar Lopez
+# sciCORE - University of Basel
+# SIB Swiss Institute of Bioinformatics
+
+easyblock = 'Tarball'
+
+name = 'MPJ-Express'
+version = '0.44'
+
+homepage = 'http://mpj-express.org/'
+description = """MPJ Express is an open source Java message passing library that allows application 
+ developers to write and execute parallel applications for multicore processors and compute clusters/clouds."""
+
+toolchain = {'name': 'goolf', 'version': '1.4.10'}
+
+source_urls = ['https://sourceforge.net/projects/mpjexpress/files/releases/']
+sources = ['mpj-v%s.tar.gz' % (version.replace('.','_'))]
+
+java = 'Java'
+javaver = '1.7.0_75'
+versionsuffix = '-%s-%s' % (java, javaver)
+
+builddependencies = [('CMake', '2.8.12')]
+
+dependencies = [
+    (java, javaver, '', True),
+]
+
+# compile JNI wrapper library as described in docs
+# http://mpj-express.org/docs/readme/README
+postinstallcmds = ["mkdir %(installdir)s/src/mpjdev/natmpjdev/lib/build",
+		   "cd %(installdir)s/src/mpjdev/natmpjdev/lib/build && cmake .. && make && make install DESTDIR=%(installdir)s",]
+
+modextrapaths = {
+    'CLASSPATH': 'lib',
+}
+
+modextravars = {
+    'MPJ_HOME': '$root', # MPJ_HOME points to install directory
+}
+
+sanity_check_paths = {
+    'files': ['lib/libnativempjdev.so', 'bin/mpjrun.sh'],
+    'dirs': []
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/m/MUSCLE/MUSCLE-3.8.31-goolf-1.4.10.eb b/easybuild/easyconfigs/m/MUSCLE/MUSCLE-3.8.31-goolf-1.4.10.eb
index 0ce77f4dfaf03dbccc24a3295d2fda3e15ea621d..f41c1f775842229aba4abc9cd9b6ff9df9fc3d0e 100644
--- a/easybuild/easyconfigs/m/MUSCLE/MUSCLE-3.8.31-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/m/MUSCLE/MUSCLE-3.8.31-goolf-1.4.10.eb
@@ -3,7 +3,7 @@
 # Swiss Institute of Bioinformatics
 # Biozentrum - University of Basel
 
-easyblock='MakeCp'
+easyblock = 'MakeCp'
 
 name = 'MUSCLE'
 version = '3.8.31'
diff --git a/easybuild/easyconfigs/m/MUSCLE/MUSCLE-3.8.31-ictce-5.5.0.eb b/easybuild/easyconfigs/m/MUSCLE/MUSCLE-3.8.31-ictce-5.5.0.eb
index ebd4dcac83259bf6172b758f7882dac229918cde..2998cc688ab6606bdeb9cc72f47f3f4fc4672455 100644
--- a/easybuild/easyconfigs/m/MUSCLE/MUSCLE-3.8.31-ictce-5.5.0.eb
+++ b/easybuild/easyconfigs/m/MUSCLE/MUSCLE-3.8.31-ictce-5.5.0.eb
@@ -3,7 +3,7 @@
 # Swiss Institute of Bioinformatics
 # Biozentrum - University of Basel
 
-easyblock='MakeCp'
+easyblock = 'MakeCp'
 
 name = 'MUSCLE'
 version = '3.8.31'
diff --git a/easybuild/easyconfigs/m/MUST/MUST-1.2.0-gompi-1.4.12-no-OFED.eb b/easybuild/easyconfigs/m/MUST/MUST-1.2.0-gompi-1.4.12-no-OFED.eb
index 94a699dcb4702e6f5e61711361e1b4c9153324e9..cd0624726e820f2c189a61c5b5573a4d397de395 100644
--- a/easybuild/easyconfigs/m/MUST/MUST-1.2.0-gompi-1.4.12-no-OFED.eb
+++ b/easybuild/easyconfigs/m/MUST/MUST-1.2.0-gompi-1.4.12-no-OFED.eb
@@ -29,7 +29,7 @@ dependencies = [('GTI', '1.2.0')]
 
 builddependencies = [('CMake', '2.8.10.2')]
 
-configopts  = ' -DCMAKE_BUILD_TYPE=Release -DGTI_INSTALL_PREFIX=${EBROOTGTI}'
+configopts = ' -DCMAKE_BUILD_TYPE=Release -DGTI_INSTALL_PREFIX=${EBROOTGTI}'
 
 sanity_check_paths = {
     'files': ["bin/mustrun", "include/mustConfig.h"],
diff --git a/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.7-GCC-4.6.3.eb b/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.7-GCC-4.6.3.eb
index 53cdff914e5898132ed07d3f785ff492a4f9aff7..22a7f9f02ed34f620d4e9fb53d1c5c8ebdda4d20 100644
--- a/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.7-GCC-4.6.3.eb
+++ b/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.7-GCC-4.6.3.eb
@@ -13,12 +13,12 @@ source_urls = ['http://mvapich.cse.ohio-state.edu/download/mvapich2']
 
 builddependencies = [('Bison', '2.5')]
 
-rdma_type = "gen2" # 'gen2' or 'udapl'
+rdma_type = "gen2"  # 'gen2' or 'udapl'
 
-## enable building of MPE routines
+# enable building of MPE routines
 withmpe = True
 
-## parallel build tends to fail
+# parallel build tends to fail
 parallel = 1
 
 moduleclass = 'mpi'
diff --git a/easybuild/easyconfigs/m/MariaDB/MariaDB-10.0.21-GNU-4.9.3-2.25.eb b/easybuild/easyconfigs/m/MariaDB/MariaDB-10.0.21-GNU-4.9.3-2.25.eb
index 6e95bf258aaabe1c1b2bb12e2075569321a3023c..8d842256191e5c6e1870a6e4a968eb8565a4d7ae 100644
--- a/easybuild/easyconfigs/m/MariaDB/MariaDB-10.0.21-GNU-4.9.3-2.25.eb
+++ b/easybuild/easyconfigs/m/MariaDB/MariaDB-10.0.21-GNU-4.9.3-2.25.eb
@@ -6,14 +6,14 @@ version = '10.0.21'
 homepage = 'https://mariadb.org/'
 description = """MariaDB An enhanced, drop-in replacement for MySQL."""
 
-toolchain = {'name': 'GNU' , 'version': '4.9.3-2.25'}
+toolchain = {'name': 'GNU', 'version': '4.9.3-2.25'}
 
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = ['https://downloads.mariadb.org/f/mariadb-10.0.21/source/']
 
 dependencies = [
     ('zlib', '1.2.8'),
-    ('ncurses' , '5.9'),
+    ('ncurses', '5.9'),
     ('libedit', '20150325'),
     ('libxml2', '2.9.2'),
 ]
diff --git a/easybuild/easyconfigs/m/MariaDB/MariaDB-5.5.29-ictce-4.1.13.eb b/easybuild/easyconfigs/m/MariaDB/MariaDB-5.5.29-ictce-4.1.13.eb
index ec2fa1dac83150eace066a55bc144124e4903d47..9e7b79069729904c1fc68cb1ea47d47600897f45 100644
--- a/easybuild/easyconfigs/m/MariaDB/MariaDB-5.5.29-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/m/MariaDB/MariaDB-5.5.29-ictce-4.1.13.eb
@@ -6,7 +6,7 @@ version = '5.5.29'
 homepage = 'https://mariadb.org/'
 description = """MariaDB An enhanced, drop-in replacement for MySQL."""
 
-toolchain = {'name': 'ictce' , 'version': '4.1.13'}
+toolchain = {'name': 'ictce', 'version': '4.1.13'}
 
 sources = [SOURCELOWER_TAR_GZ]
 
@@ -14,7 +14,7 @@ sources = [SOURCELOWER_TAR_GZ]
 patches = ['define_unreachable_builtin.patch']
 
 dependencies = [
-    ('ncurses' , '5.9'),
+    ('ncurses', '5.9'),
     ('libreadline', '6.2'),
 ]
 
diff --git a/easybuild/easyconfigs/m/Mercurial/Mercurial-2.3.2-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/m/Mercurial/Mercurial-2.3.2-ictce-5.3.0-Python-2.7.3.eb
index 791d375531e0e1c5931fff08e0d5c9903478969e..f2baa1d123df9bd6bd71250e39c6f388cfab5ce4 100644
--- a/easybuild/easyconfigs/m/Mercurial/Mercurial-2.3.2-ictce-5.3.0-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/m/Mercurial/Mercurial-2.3.2-ictce-5.3.0-Python-2.7.3.eb
@@ -22,8 +22,8 @@ versionsuffix = "-%s-%s" % (python, pythonversion)
 dependencies = [(python, pythonversion)]
 
 sanity_check_paths = {
-                      'files': ['bin/hg'],
-                      'dirs': ['lib/python%s/site-packages/mercurial' % pythonshortversion]
-                     }
+    'files': ['bin/hg'],
+    'dirs': ['lib/python%s/site-packages/mercurial' % pythonshortversion]
+}
 
 moduleclass = 'tools'
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 9fed17ec40c48af1441505a28055c04c3c528d27..2c72b2e6f54a87a865024750b1dcc884f03c6760 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
@@ -49,7 +49,7 @@ dependencies = [
     ('eudev', '3.0'),
 ]
 
-#Use the os provided libudev or the EB provided eudev
+# Use the os provided libudev or the EB provided eudev
 #osdependencies = ['libudev']
 
 # GLU is not part anymore of Mesa package!
diff --git a/easybuild/easyconfigs/m/Mesa/Mesa-10.5.5-intel-2015a-Python-2.7.10.eb b/easybuild/easyconfigs/m/Mesa/Mesa-10.5.5-intel-2015a-Python-2.7.10.eb
index ddd54508d05829363d88720a4b7ede83202c0c5b..1a69d474413cc5fbe35f76807094bff3b1d3f2bb 100644
--- a/easybuild/easyconfigs/m/Mesa/Mesa-10.5.5-intel-2015a-Python-2.7.10.eb
+++ b/easybuild/easyconfigs/m/Mesa/Mesa-10.5.5-intel-2015a-Python-2.7.10.eb
@@ -46,7 +46,7 @@ dependencies = [
     ('eudev', '3.0'),
 ]
 
-#Use the os provided libudev or the EB provided eudev
+# Use the os provided libudev or the EB provided eudev
 #osdependencies = ['libudev']
 
 # GLU is not part anymore of Mesa package!
diff --git a/easybuild/easyconfigs/m/Mesa/Mesa-11.0.2-intel-2015b-Python-2.7.10.eb b/easybuild/easyconfigs/m/Mesa/Mesa-11.0.2-intel-2015b-Python-2.7.10.eb
index 3e51cbc3cf3299cccff9186e28d98a60e711240e..9d960059a5d49958a1d30129e8f2a1b67cd6e9a9 100644
--- a/easybuild/easyconfigs/m/Mesa/Mesa-11.0.2-intel-2015b-Python-2.7.10.eb
+++ b/easybuild/easyconfigs/m/Mesa/Mesa-11.0.2-intel-2015b-Python-2.7.10.eb
@@ -45,7 +45,7 @@ dependencies = [
     ('eudev', '3.1.2'),
 ]
 
-#Use the os provided libudev or the EB provided eudev
+# Use the os provided libudev or the EB provided eudev
 #osdependencies = ['libudev']
 
 # GLU is not part anymore of Mesa package!
diff --git a/easybuild/easyconfigs/m/Mesa/Mesa-11.0.8-intel-2015b-Python-2.7.11.eb b/easybuild/easyconfigs/m/Mesa/Mesa-11.0.8-intel-2015b-Python-2.7.11.eb
index 5bc1c00683acd05f0b7fd65669636c08600512c6..73b355c719f6ba7fa57a048d8f2b2bbce713c0c0 100644
--- a/easybuild/easyconfigs/m/Mesa/Mesa-11.0.8-intel-2015b-Python-2.7.11.eb
+++ b/easybuild/easyconfigs/m/Mesa/Mesa-11.0.8-intel-2015b-Python-2.7.11.eb
@@ -45,7 +45,7 @@ dependencies = [
     ('eudev', '3.1.5'),
 ]
 
-#Use the os provided libudev or the EB provided eudev
+# Use the os provided libudev or the EB provided eudev
 #osdependencies = ['libudev']
 
 # GLU is not part anymore of Mesa package!
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 071c95fba21833ccaa0110341b6e78ed753d4260..0cd27019acea5b577497606174c6ecd68257c46d 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
@@ -21,22 +21,22 @@ pythonshortver = '.'.join(pythonver.split('.')[0:2])
 versionsuffix = '-%s-%s' % ('Python', pythonver)
 
 dependencies = [
-        ('flex', '2.5.35'),
-        ('Bison', '2.5'),
-        ('makedepend', '1.0.4'),
-        ('Python', pythonver),
-        ('libxml2', '2.8.0', versionsuffix),
-        ('glproto', '1.4.16'),
-        ('libdrm', '2.4.27')
-        ]
+    ('flex', '2.5.35'),
+    ('Bison', '2.5'),
+    ('makedepend', '1.0.4'),
+    ('Python', pythonver),
+    ('libxml2', '2.8.0', versionsuffix),
+    ('glproto', '1.4.16'),
+    ('libdrm', '2.4.27')
+]
 
 osdependencies = [
-            'libX11-devel',  # Xlibs.h
-            'xorg-x11-proto-devel',  # X.h, glproto, xproto
-            'libXdamage-devel',
-            'libXext-devel',
-            'libXfixes-devel',
-        ]
+    'libX11-devel',  # Xlibs.h
+    'xorg-x11-proto-devel',  # X.h, glproto, xproto
+    'libXdamage-devel',
+    'libXext-devel',
+    'libXfixes-devel',
+]
 
 configopts = " --disable-osmesa --enable-glu --disable-gallium-llvm --disable-gallium-gbm --enable-glx --with-driver=xlib"
 configopts += " --disable-driglx-direct --with-gallium-drivers='' --without-demos --disable-egl"""
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 3fa0d3f751f1389f5244bc6c8a34f43a0d175d36..a724cb0c527e939746427219619c8621ae5dd40f 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
@@ -20,22 +20,22 @@ pythonshortver = '.'.join(pythonver.split('.')[0:2])
 versionsuffix = '-%s-%s' % ('Python', pythonver)
 
 dependencies = [
-        ('flex', '2.5.35'),
-        ('Bison', '2.5'),
-        ('makedepend', '1.0.4'),
-        ('Python', pythonver),
-        ('libxml2', '2.8.0', versionsuffix),
-        ('glproto', '1.4.16'),
-        ('libdrm', '2.4.27')
-        ]
+    ('flex', '2.5.35'),
+    ('Bison', '2.5'),
+    ('makedepend', '1.0.4'),
+    ('Python', pythonver),
+    ('libxml2', '2.8.0', versionsuffix),
+    ('glproto', '1.4.16'),
+    ('libdrm', '2.4.27')
+]
 
 osdependencies = [
-            'libX11-devel',  # Xlibs.h
-            'xorg-x11-proto-devel',  # X.h, glproto, xproto
-            'libXdamage-devel',
-            'libXext-devel',
-            'libXfixes-devel',
-        ]
+    'libX11-devel',  # Xlibs.h
+    'xorg-x11-proto-devel',  # X.h, glproto, xproto
+    'libXdamage-devel',
+    'libXext-devel',
+    'libXfixes-devel',
+]
 
 configopts = " --disable-osmesa --enable-glu --disable-gallium-llvm --disable-gallium-gbm --enable-glx --with-driver=xlib"
 configopts += " --disable-driglx-direct --with-gallium-drivers='' --without-demos --disable-egl"""
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 864dc0bea3033a68446471667d3c1819b2a4c74f..70a2816d6bbce99963bebb64f7b6f6fcbbb397a3 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
@@ -21,22 +21,22 @@ pythonshortver = '.'.join(pythonver.split('.')[0:2])
 versionsuffix = '-%s-%s' % ('Python', pythonver)
 
 dependencies = [
-        ('flex', '2.5.35'),
-        ('Bison', '2.5'),
-        ('makedepend', '1.0.4'),
-        ('Python', pythonver),
-        ('libxml2', '2.8.0', versionsuffix),
-        ('glproto', '1.4.16'),
-        ('libdrm', '2.4.27')
-        ]
+    ('flex', '2.5.35'),
+    ('Bison', '2.5'),
+    ('makedepend', '1.0.4'),
+    ('Python', pythonver),
+    ('libxml2', '2.8.0', versionsuffix),
+    ('glproto', '1.4.16'),
+    ('libdrm', '2.4.27')
+]
 
 osdependencies = [
-            'libX11-devel',  # Xlibs.h
-            'xorg-x11-proto-devel',  # X.h, glproto, xproto
-            'libXdamage-devel',
-            'libXext-devel',
-            'libXfixes-devel',
-        ]
+    'libX11-devel',  # Xlibs.h
+    'xorg-x11-proto-devel',  # X.h, glproto, xproto
+    'libXdamage-devel',
+    'libXext-devel',
+    'libXfixes-devel',
+]
 
 configopts = " --disable-osmesa --enable-glu --disable-gallium-llvm --disable-gallium-gbm --enable-glx --with-driver=xlib"
 configopts += " --disable-driglx-direct --with-gallium-drivers='' --without-demos --disable-egl"""
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 4ae1b349117163e193e71f0a65830cee7cb5829d..0371483898db2bed0ec76e011e2e544dde5de98a 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
@@ -21,13 +21,13 @@ pythonshortver = '.'.join(pythonver.split('.')[0:2])
 versionsuffix = '-%s-%s' % ('Python', pythonver)
 
 dependencies = [
-        ('flex', '2.5.35'),
-        ('Bison', '2.5'),
-        ('makedepend', '1.0.4'),
-        ('Python', pythonver),
-        ('libxml2', '2.8.0', versionsuffix),
-        ('glproto', '1.4.16'),
-        ('libdrm', '2.4.27')
+    ('flex', '2.5.35'),
+    ('Bison', '2.5'),
+    ('makedepend', '1.0.4'),
+    ('Python', pythonver),
+    ('libxml2', '2.8.0', versionsuffix),
+    ('glproto', '1.4.16'),
+    ('libdrm', '2.4.27')
 ]
 
 osdependencies = [
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 8f7b8fd9e1830bc0368eddbe80bc24b0d21283a0..7e87cc2bd48924e98d0f413b82bf452bf98241cd 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
@@ -22,22 +22,22 @@ pythonshortver = '.'.join(pythonver.split('.')[0:2])
 versionsuffix = '-%s-%s' % ('Python', pythonver)
 
 dependencies = [
-        ('flex', '2.5.35'),
-        ('Bison', '2.5'),
-        ('makedepend', '1.0.4'),
-        ('Python', pythonver),
-        ('libxml2', '2.8.0', versionsuffix),
-        ('glproto', '1.4.16'),
-        ('libdrm', '2.4.27')
-        ]
+    ('flex', '2.5.35'),
+    ('Bison', '2.5'),
+    ('makedepend', '1.0.4'),
+    ('Python', pythonver),
+    ('libxml2', '2.8.0', versionsuffix),
+    ('glproto', '1.4.16'),
+    ('libdrm', '2.4.27')
+]
 
 osdependencies = [
-            'libX11-devel',  # Xlibs.h
-            'xorg-x11-proto-devel',  # X.h, glproto, xproto
-            'libXdamage-devel',
-            'libXext-devel',
-            'libXfixes-devel',
-        ]
+    'libX11-devel',  # Xlibs.h
+    'xorg-x11-proto-devel',  # X.h, glproto, xproto
+    'libXdamage-devel',
+    'libXext-devel',
+    'libXfixes-devel',
+]
 
 configopts = " --disable-osmesa --enable-glu --disable-gallium-llvm --disable-gallium-gbm --enable-glx --with-driver=xlib"
 configopts += " --disable-driglx-direct --with-gallium-drivers='' --without-demos --disable-egl"""
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 5ee01321f8a8084a5ddbc0b59bd3388331737ecc..3af2bae350a4dc33a92dca393c996a77b93c141d 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 546db6338aa1f5535328d68f1957b1b8e2267e5c..3f4fca59197932da6c8187cd4b81f5971f4e6e4f 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/Molden/Molden-5.0-ictce-4.1.13.eb b/easybuild/easyconfigs/m/Molden/Molden-5.0-ictce-4.1.13.eb
index 33a900aecd00a29e5aacdb9a36f11e40319e160d..23f121832f681bb97b495e2f4e912ec0f9384778 100644
--- a/easybuild/easyconfigs/m/Molden/Molden-5.0-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/m/Molden/Molden-5.0-ictce-4.1.13.eb
@@ -15,9 +15,9 @@ source_urls = ['ftp://ftp.cmbi.ru.nl/pub/molgraph/molden']
 
 buildopts = 'CC="$CC" FC="$F90" molden'
 
-files_to_copy = [(['molden'],'bin'), 'CopyRight', 'README', 'REGISTER']
+files_to_copy = [(['molden'], 'bin'), 'CopyRight', 'README', 'REGISTER']
 
-sanity_check_paths={
+sanity_check_paths = {
     'files': ['bin/molden', 'README', 'REGISTER'],
     'dirs': [],
 }
diff --git a/easybuild/easyconfigs/m/MotEvo/MotEvo-1.02-goolf-1.4.10.eb b/easybuild/easyconfigs/m/MotEvo/MotEvo-1.02-goolf-1.4.10.eb
index aa2cc82aa991c1d0f236c9e02eb63a0a1f1db55c..5da93a4bfe9cb6be9a931c193907082b2d20e9b9 100644
--- a/easybuild/easyconfigs/m/MotEvo/MotEvo-1.02-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/m/MotEvo/MotEvo-1.02-goolf-1.4.10.eb
@@ -3,7 +3,7 @@
 # Swiss Institute of Bioinformatics
 # Biozentrum - University of Basel
 
-easyblock='MakeCp'
+easyblock = 'MakeCp'
 
 name = 'MotEvo'
 version = '1.02'
diff --git a/easybuild/easyconfigs/m/MultiNest/MultiNest-3.10-intel-2015b.eb b/easybuild/easyconfigs/m/MultiNest/MultiNest-3.10-intel-2015b.eb
index 1640a345124dbac11b93bd4a5b352a490644e17f..13350aae1fc1cd948beba3ab8d10cd26e51a504d 100644
--- a/easybuild/easyconfigs/m/MultiNest/MultiNest-3.10-intel-2015b.eb
+++ b/easybuild/easyconfigs/m/MultiNest/MultiNest-3.10-intel-2015b.eb
@@ -18,7 +18,8 @@ builddependencies = [('CMake', '3.4.0')]
 sanity_check_paths = {
     'files': ['bin/%s' % x for x in ['ackley', 'eggboxC', 'eggboxC++', 'gaussian', 'gauss_shell', 'himmelblau',
                                      'obj_detect', 'rosenbrock']] +
-             ['lib/lib%s' % x for x in ['multinest.a', 'multinest_mpi.a', 'multinest_mpi.%s' % SHLIB_EXT, 'multinest.%s' % SHLIB_EXT]] +
+             ['lib/lib%s' % x for x in ['multinest.a', 'multinest_mpi.a', 'multinest_mpi.%s' % SHLIB_EXT,
+                                        'multinest.%s' % SHLIB_EXT]] +
              ['include/multinest.h'],
     'dirs': ['modules'],
 }
diff --git a/easybuild/easyconfigs/m/MySQL/MySQL-5.6.20-intel-2014b-clientonly.eb b/easybuild/easyconfigs/m/MySQL/MySQL-5.6.20-intel-2014b-clientonly.eb
index b14d94df8435a712ab1e8d6428f419c146846ba9..50dda691db6841b4bb7054dc97ca780b00c2b499 100644
--- a/easybuild/easyconfigs/m/MySQL/MySQL-5.6.20-intel-2014b-clientonly.eb
+++ b/easybuild/easyconfigs/m/MySQL/MySQL-5.6.20-intel-2014b-clientonly.eb
@@ -8,7 +8,7 @@ homepage = 'http://www.mysql.com/'
 description = """MySQL is (as of March 2014) the world's second most widely used
  open-source relational database management system (RDBMS)."""
 
-#http://dev.mysql.com/get/Downloads/MySQL-5.6/mysql-5.6.20.tar.gz
+# http://dev.mysql.com/get/Downloads/MySQL-5.6/mysql-5.6.20.tar.gz
 source_urls = ['http://dev.mysql.com/get/Downloads/MySQL-%(version_major_minor)s/']
 sources = [SOURCELOWER_TAR_GZ]
 
@@ -20,7 +20,7 @@ dependencies = [
     ('libevent', '2.0.21'),
     ('libreadline', '6.3'),
     ('zlib', '1.2.8'),
-#    ('OpenSSL', '1.0.1i'),  # OS dependency should be preferred for security reasons
+    #    ('OpenSSL', '1.0.1i'),  # OS dependency should be preferred for security reasons
 ]
 
 builddependencies = [
diff --git a/easybuild/easyconfigs/m/MySQL/MySQL-5.6.26-GNU-4.9.3-2.25-clientonly.eb b/easybuild/easyconfigs/m/MySQL/MySQL-5.6.26-GNU-4.9.3-2.25-clientonly.eb
index bae1276ac2d48d9a72e315d8d3c9d31a18d629be..6b59f1b4bfe0d8f6d4d415a3d3bcc8abd1ba39d7 100644
--- a/easybuild/easyconfigs/m/MySQL/MySQL-5.6.26-GNU-4.9.3-2.25-clientonly.eb
+++ b/easybuild/easyconfigs/m/MySQL/MySQL-5.6.26-GNU-4.9.3-2.25-clientonly.eb
@@ -18,7 +18,7 @@ dependencies = [
     ('ncurses', '5.9'),
     ('libedit', '20150325'),
     ('zlib', '1.2.8'),
-#    ('OpenSSL', '1.0.1p'),  # OS dependency should be preferred for security reasons
+    #    ('OpenSSL', '1.0.1p'),  # OS dependency should be preferred for security reasons
 ]
 
 osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
diff --git a/easybuild/easyconfigs/m/matplotlib/matplotlib-1.5.1-intel-2015b-Python-2.7.11.eb b/easybuild/easyconfigs/m/matplotlib/matplotlib-1.5.1-intel-2015b-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..1364208ceef9bfa8001984b63d643fca149b9c05
--- /dev/null
+++ b/easybuild/easyconfigs/m/matplotlib/matplotlib-1.5.1-intel-2015b-Python-2.7.11.eb
@@ -0,0 +1,45 @@
+easyblock = 'Bundle'
+
+name = 'matplotlib'
+version = '1.5.1'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'http://matplotlib.org'
+description = """matplotlib is a python 2D plotting library which produces publication quality figures in a variety of
+ hardcopy formats and interactive environments across platforms. matplotlib can be used in python scripts, the python
+ and ipython shell, web application servers, and six graphical user interface toolkits."""
+
+toolchain = {'name': 'intel', 'version': '2015b'}
+
+# this is a bundle of Python packages
+exts_defaultclass = 'PythonPackage'
+exts_filter = ('python -c "import %(ext_name)s"', '')
+
+dependencies = [
+    ('Python', '2.7.11'),
+    ('freetype', '2.6.2'),
+    ('libpng', '1.6.21'),
+]
+
+exts_list = [
+    ('Cycler', '0.9.0', {
+        'modulename': 'cycler',
+        'source_urls': ['https://pypi.python.org/packages/source/C/Cycler'],
+        'source_tmpl': 'cycler-%(version)s.tar.gz',
+    }),
+    (name, version, {
+        'source_urls': ['https://pypi.python.org/packages/source/m/matplotlib'],
+    }),
+]
+
+# specify that Bundle easyblock should run a full sanity check, rather than just trying to load the module
+full_sanity_check = True
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%(pyshortver)s/site-packages'],
+}
+
+modextrapaths = {'PYTHONPATH': ['lib/python%(pyshortver)s/site-packages']}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/m/matplotlib/matplotlib-1.5.1-intel-2016a-Python-2.7.11.eb b/easybuild/easyconfigs/m/matplotlib/matplotlib-1.5.1-intel-2016a-Python-2.7.11.eb
index 192e60d3a1522ed45d0e030997eb9ea3cde58b2d..c62d74a1eb01f6732ab4ebe6dbedf7e629366ba8 100644
--- a/easybuild/easyconfigs/m/matplotlib/matplotlib-1.5.1-intel-2016a-Python-2.7.11.eb
+++ b/easybuild/easyconfigs/m/matplotlib/matplotlib-1.5.1-intel-2016a-Python-2.7.11.eb
@@ -1,7 +1,8 @@
-easyblock = 'PythonPackage'
+easyblock = 'Bundle'
 
 name = 'matplotlib'
 version = '1.5.1'
+versionsuffix = '-Python-%(pyver)s'
 
 homepage = 'http://matplotlib.org'
 description = """matplotlib is a python 2D plotting library which produces publication quality figures in a variety of
@@ -10,23 +11,35 @@ description = """matplotlib is a python 2D plotting library which produces publi
 
 toolchain = {'name': 'intel', 'version': '2016a'}
 
-source_urls = [SOURCEFORGE_SOURCE]
-sources = [SOURCELOWER_TAR_GZ]
-
-pyver = '2.7.11'
-pyshortver = '.'.join(pyver.split('.')[:2])
-
-versionsuffix = '-Python-%s' % pyver
+# this is a bundle of Python packages
+exts_defaultclass = 'PythonPackage'
+exts_filter = ('python -c "import %(ext_name)s"', '')
 
 dependencies = [
-    ('Python', pyver),
+    ('Python', '2.7.11'),
     ('freetype', '2.6.2'),
     ('libpng', '1.6.21'),
 ]
 
+exts_list = [
+    ('Cycler', '0.9.0', {
+        'modulename': 'cycler',
+        'source_urls': ['https://pypi.python.org/packages/source/C/Cycler'],
+        'source_tmpl': 'cycler-%(version)s.tar.gz',
+    }),
+    (name, version, {
+        'source_urls': ['https://pypi.python.org/packages/source/m/matplotlib'],
+    }),
+]
+
+# specify that Bundle easyblock should run a full sanity check, rather than just trying to load the module
+full_sanity_check = True
+
 sanity_check_paths = {
     'files': [],
-    'dirs': ['lib/python%s/site-packages' % pyshortver],
+    'dirs': ['lib/python%(pyshortver)s/site-packages'],
 }
 
+modextrapaths = {'PYTHONPATH': ['lib/python%(pyshortver)s/site-packages']}
+
 moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/m/mc/mc-4.6.1-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/m/mc/mc-4.6.1-goalf-1.1.0-no-OFED.eb
index ecfb57dda393197be94a9a8ac44bdcce91c71511..a05d90692447fbb4fe82b088cb23adf5dac72871 100644
--- a/easybuild/easyconfigs/m/mc/mc-4.6.1-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/m/mc/mc-4.6.1-goalf-1.1.0-no-OFED.eb
@@ -24,8 +24,8 @@ source_urls = ['http://www.ibiblio.org/pub/Linux/utils/file/managers/mc/']
 toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
 
 sanity_check_paths = {
-                      'files': ['bin/mc'],
-                      'dirs': []
-                     }
+    'files': ['bin/mc'],
+    'dirs': []
+}
 
 moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/m/mc/mc-4.6.1-goolf-1.4.10.eb b/easybuild/easyconfigs/m/mc/mc-4.6.1-goolf-1.4.10.eb
index 438ec80d0eaa64eeceeef4b4f1e7e8afd2198f79..87c8b17b1f9538ff9c3d3455a63c24e5a064e732 100644
--- a/easybuild/easyconfigs/m/mc/mc-4.6.1-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/m/mc/mc-4.6.1-goolf-1.4.10.eb
@@ -23,8 +23,8 @@ source_urls = ['http://www.ibiblio.org/pub/Linux/utils/file/managers/mc/']
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 
 sanity_check_paths = {
-                      'files': ['bin/mc'],
-                      'dirs': []
-                     }
+    'files': ['bin/mc'],
+    'dirs': []
+}
 
 moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/m/mc/mc-4.6.1-ictce-4.0.6.eb b/easybuild/easyconfigs/m/mc/mc-4.6.1-ictce-4.0.6.eb
index ec94a5a333d6b4b5a907933890d53a1630ee541e..9830f3790462fe93b701a833b28a4b8a2ec24c1e 100644
--- a/easybuild/easyconfigs/m/mc/mc-4.6.1-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/m/mc/mc-4.6.1-ictce-4.0.6.eb
@@ -24,8 +24,8 @@ source_urls = ['http://www.ibiblio.org/pub/Linux/utils/file/managers/mc/']
 toolchain = {'version': '4.0.6', 'name': 'ictce'}
 
 sanity_check_paths = {
-                      'files': ['bin/mc'],
-                      'dirs': []
-                     }
+    'files': ['bin/mc'],
+    'dirs': []
+}
 
 moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/m/mc/mc-4.6.1-ictce-5.3.0.eb b/easybuild/easyconfigs/m/mc/mc-4.6.1-ictce-5.3.0.eb
index f390a24559e3255f27da41a2d0f098a3a9200817..7047839f2d2bd4b8556c360fd6881f9930640627 100644
--- a/easybuild/easyconfigs/m/mc/mc-4.6.1-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/m/mc/mc-4.6.1-ictce-5.3.0.eb
@@ -25,8 +25,8 @@ source_urls = ['http://www.ibiblio.org/pub/Linux/utils/file/managers/mc/']
 toolchain = {'name': 'ictce', 'version': '5.3.0'}
 
 sanity_check_paths = {
-                      'files': ['bin/mc'],
-                      'dirs': []
-                     }
+    'files': ['bin/mc'],
+    'dirs': []
+}
 
 moduleclass = 'tools'
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 f389f068078ce10e2120e00505787582a0a331c2..13a13c28d8ea56de898bce183a0962ad4cac2ed4 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,9 +25,9 @@ parallel = 1
 buildopts = ' CC="$CC"'
 
 files_to_copy = [
-        (['mdtest'], 'bin'),
-        "README",
-        "COPYRIGHT",
+    (['mdtest'], 'bin'),
+    "README",
+    "COPYRIGHT",
 ]
 
 sanity_check_paths = {
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 9444c160fdaf0605aa94ebce2300c055f506607e..fdcf4609afe1d62a1d2a306310e13bb1fa6f3662 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,9 +25,9 @@ parallel = 1
 buildopts = ' CC="$CC"'
 
 files_to_copy = [
-        (['mdtest'], 'bin'),
-        "README",
-        "COPYRIGHT",
+    (['mdtest'], 'bin'),
+    "README",
+    "COPYRIGHT",
 ]
 
 sanity_check_paths = {
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 a7dcc82e6246c99b71df04399062292e10967cd7..6a4c7c8893d9232906b1adc9902f6541fd0f6847 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,11 +25,11 @@ parallel = 1
 buildopts = ' CC="$CC"'
 
 files_to_copy = [
-        (['mdtest'], 'bin'),
-        (['mdtest.1'], 'man/man1'),
-        "README",
-        "RELEASE_LOG",
-        "scripts"
+    (['mdtest'], 'bin'),
+    (['mdtest.1'], 'man/man1'),
+    "README",
+    "RELEASE_LOG",
+    "scripts"
 ]
 
 sanity_check_paths = {
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 2085a445de5b832dce805e4b91292aeb36de2fa1..31e12db3cce2683bc08cbf925e9d8d29da3e82eb 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,11 +25,11 @@ parallel = 1
 buildopts = ' CC="$CC"'
 
 files_to_copy = [
-        (['mdtest'], 'bin'),
-        (['mdtest.1'], 'man/man1'),
-        "README",
-        "RELEASE_LOG",
-        "scripts"
+    (['mdtest'], 'bin'),
+    (['mdtest.1'], 'man/man1'),
+    "README",
+    "RELEASE_LOG",
+    "scripts"
 ]
 
 sanity_check_paths = {
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 de5230e1fac51acfacbc625d8ee814e64c46fff4..b4a81e41a35c4780e6310492b462d9024d36af55 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
@@ -9,10 +9,7 @@ the Python programming language, allowing any Python program to exploit multiple
 
 toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
 
-source_urls = [
-    BITBUCKET_DOWNLOADS,
-    GOOGLECODE_SOURCE,
-]
+source_urls = [BITBUCKET_DOWNLOADS]
 sources = [SOURCE_TAR_GZ]
 
 python = 'Python'
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 c04cd339fdfce0b24ab24598f654c7eeedb661fb..e5d94c2ee2c45647db67ce23b92f6c7d452933ca 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
@@ -9,10 +9,7 @@ the Python programming language, allowing any Python program to exploit multiple
 
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 
-source_urls = [
-    BITBUCKET_DOWNLOADS,
-    GOOGLECODE_SOURCE,
-]
+source_urls = [BITBUCKET_DOWNLOADS]
 sources = [SOURCE_TAR_GZ]
 
 python = 'Python'
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 bc0d20fdcba25ccdaeb0ba5af7355f4efe7e374d..4e871b0231ac5c063d62bb0c1d3fedc06e0ca56b 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
@@ -10,10 +10,7 @@ language, allowing any Python program to exploit multiple processors."""
 
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 
-source_urls = [
-    BITBUCKET_DOWNLOADS,
-    GOOGLECODE_SOURCE,
-]
+source_urls = [BITBUCKET_DOWNLOADS]
 sources = [SOURCE_TAR_GZ]
 
 python = 'Python'
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 ad06de5d4f6dffeb4d8887fe81d6e3729e9c9705..40a44908c44739c4d6d8d885fed8bd4fe318247c 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
@@ -9,10 +9,7 @@ the Python programming language, allowing any Python program to exploit multiple
 
 toolchain = {'name': 'ictce', 'version': '4.0.6'}
 
-source_urls = [
-    BITBUCKET_DOWNLOADS,
-    GOOGLECODE_SOURCE,
-]
+source_urls = [BITBUCKET_DOWNLOADS]
 sources = [SOURCE_TAR_GZ]
 
 python = 'Python'
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 c69d7c6073ca42d1e1fc14fa5f20d9b5734b0138..71702ea79c5136eec91621f74425cff8aaf5aa9d 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
@@ -9,10 +9,7 @@ the Python programming language, allowing any Python program to exploit multiple
 
 toolchain = {'name': 'ictce', 'version': '4.1.13'}
 
-source_urls = [
-    BITBUCKET_DOWNLOADS,
-    GOOGLECODE_SOURCE,
-]
+source_urls = [BITBUCKET_DOWNLOADS]
 sources = [SOURCE_TAR_GZ]
 
 python = 'Python'
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 94b5a9f2f87793e9b9653cb8d2986f7fcaf0c666..14d09f706a14a8f9242096f91c331d1b956ad514 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
@@ -9,10 +9,7 @@ description = """MPI for Python (mpi4py) provides bindings of the Message Passin
 
 toolchain = {'name': 'ictce', 'version': '5.3.0'}
 
-source_urls = [
-    BITBUCKET_DOWNLOADS,
-    GOOGLECODE_SOURCE,
-]
+source_urls = [BITBUCKET_DOWNLOADS]
 sources = [SOURCE_TAR_GZ]
 
 python = 'Python'
diff --git a/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-ictce-5.5.0-Python-2.7.5.eb b/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-ictce-5.5.0-Python-2.7.5.eb
index 07635c8d39050512fdcc0a4c0c28c8a05624d81a..96628ba336dc2e2c1992ca321e3ff265fd250cb7 100644
--- a/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-ictce-5.5.0-Python-2.7.5.eb
+++ b/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3-ictce-5.5.0-Python-2.7.5.eb
@@ -9,10 +9,7 @@ description = """MPI for Python (mpi4py) provides bindings of the Message Passin
 
 toolchain = {'name': 'ictce', 'version': '5.5.0'}
 
-source_urls = [
-    BITBUCKET_DOWNLOADS,
-    GOOGLECODE_SOURCE,
-]
+source_urls = [BITBUCKET_DOWNLOADS]
 sources = [SOURCE_TAR_GZ]
 
 python = 'Python'
diff --git a/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3.1-intel-2015b-Python-2.7.10-timed-pingpong.eb b/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3.1-intel-2015b-Python-2.7.10-timed-pingpong.eb
index 85752ecebfe047522b78b7f2d8e0bb7b0634e698..e8592db2a2b51cbe3b428d0014834baaff54956f 100644
--- a/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3.1-intel-2015b-Python-2.7.10-timed-pingpong.eb
+++ b/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3.1-intel-2015b-Python-2.7.10-timed-pingpong.eb
@@ -9,10 +9,7 @@ description = """MPI for Python (mpi4py) provides bindings of the Message Passin
 
 toolchain = {'name': 'intel', 'version': '2015b'}
 
-source_urls = [
-    BITBUCKET_DOWNLOADS,
-    GOOGLECODE_SOURCE,
-]
+source_urls = [BITBUCKET_DOWNLOADS]
 sources = [SOURCE_TAR_GZ]
 
 label = 'timed-pingpong'
diff --git a/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3.1-intel-2015b-Python-2.7.10.eb b/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3.1-intel-2015b-Python-2.7.10.eb
index b6e7008371ab4e23683ad59e06ddb683e7fbbb35..9ee5130156a98b763ea9d9e0826b4a56b010546e 100644
--- a/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3.1-intel-2015b-Python-2.7.10.eb
+++ b/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3.1-intel-2015b-Python-2.7.10.eb
@@ -9,10 +9,7 @@ description = """MPI for Python (mpi4py) provides bindings of the Message Passin
 
 toolchain = {'name': 'intel', 'version': '2015b'}
 
-source_urls = [
-    BITBUCKET_DOWNLOADS,
-    GOOGLECODE_SOURCE,
-]
+source_urls = [BITBUCKET_DOWNLOADS]
 sources = [SOURCE_TAR_GZ]
 
 py_maj_min = '2.7'
diff --git a/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3.1-intel-2015b-Python-2.7.11-timed-pingpong.eb b/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3.1-intel-2015b-Python-2.7.11-timed-pingpong.eb
new file mode 100644
index 0000000000000000000000000000000000000000..8f22d6b6077390304892791b58e0d50067804930
--- /dev/null
+++ b/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3.1-intel-2015b-Python-2.7.11-timed-pingpong.eb
@@ -0,0 +1,34 @@
+easyblock = 'PythonPackage'
+
+name = 'mpi4py'
+version = '1.3.1'
+label = 'timed-pingpong'
+versionsuffix = '-Python-%%(pyver)s-%s' % label
+
+homepage = 'https://bitbucket.org/mpi4py/mpi4py'
+description = """MPI for Python (mpi4py) provides bindings of the Message Passing Interface (MPI) standard for
+ the Python programming language, allowing any Python program to exploit multiple processors."""
+
+toolchain = {'name': 'intel', 'version': '2015b'}
+
+source_urls = [BITBUCKET_DOWNLOADS]
+sources = [SOURCE_TAR_GZ]
+
+patches = ['mpi4py-%%(version)s_%s.patch' % label]
+
+dependencies = [('Python', '2.7.11')]
+
+# force rebuilding everything, including patched files
+buildopts = '--force'
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%(pyshortver)s/site-packages/mpi4py'],
+}
+
+# check that timed pingpong routines that are added via the patch are available
+sanity_check_commands = [
+    ('python', '-c "from mpi4py.MPI import Comm; import sys; sys.exit((1, 0)[\'PingpongRS\' in dir(Comm)])"'),
+]
+
+moduleclass = 'mpi'
diff --git a/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3.1-intel-2016a-Python-2.7.11-timed-pingpong.eb b/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3.1-intel-2016a-Python-2.7.11-timed-pingpong.eb
new file mode 100644
index 0000000000000000000000000000000000000000..654b6f59ec1756e96f8a951965d4aa6a9afc3cc7
--- /dev/null
+++ b/easybuild/easyconfigs/m/mpi4py/mpi4py-1.3.1-intel-2016a-Python-2.7.11-timed-pingpong.eb
@@ -0,0 +1,34 @@
+easyblock = 'PythonPackage'
+
+name = 'mpi4py'
+version = '1.3.1'
+label = 'timed-pingpong'
+versionsuffix = '-Python-%%(pyver)s-%s' % label
+
+homepage = 'https://bitbucket.org/mpi4py/mpi4py'
+description = """MPI for Python (mpi4py) provides bindings of the Message Passing Interface (MPI) standard for
+ the Python programming language, allowing any Python program to exploit multiple processors."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+source_urls = [BITBUCKET_DOWNLOADS]
+sources = [SOURCE_TAR_GZ]
+
+patches = ['mpi4py-%%(version)s_%s.patch' % label]
+
+dependencies = [('Python', '2.7.11')]
+
+# force rebuilding everything, including patched files
+buildopts = '--force'
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%(pyshortver)s/site-packages/mpi4py'],
+}
+
+# check that timed pingpong routines that are added via the patch are available
+sanity_check_commands = [
+    ('python', '-c "from mpi4py.MPI import Comm; import sys; sys.exit((1, 0)[\'PingpongRS\' in dir(Comm)])"'),
+]
+
+moduleclass = 'mpi'
diff --git a/easybuild/easyconfigs/m/mpi4py/mpi4py-2.0.0-intel-2015b-Python-2.7.10.eb b/easybuild/easyconfigs/m/mpi4py/mpi4py-2.0.0-intel-2015b-Python-2.7.10.eb
index 336877544bdad4bdeb6f81e6abb5e31bb68e467a..0bec59079b83e83a48b7b662db060f7e25a6ef25 100644
--- a/easybuild/easyconfigs/m/mpi4py/mpi4py-2.0.0-intel-2015b-Python-2.7.10.eb
+++ b/easybuild/easyconfigs/m/mpi4py/mpi4py-2.0.0-intel-2015b-Python-2.7.10.eb
@@ -9,10 +9,7 @@ description = """MPI for Python (mpi4py) provides bindings of the Message Passin
 
 toolchain = {'name': 'intel', 'version': '2015b'}
 
-source_urls = [
-    BITBUCKET_DOWNLOADS,
-    GOOGLECODE_SOURCE,
-]
+source_urls = [BITBUCKET_DOWNLOADS]
 sources = [SOURCE_TAR_GZ]
 
 py_maj_min = '2.7'
diff --git a/easybuild/easyconfigs/m/mpiBLAST/mpiBLAST-1.6.0-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/m/mpiBLAST/mpiBLAST-1.6.0-goalf-1.1.0-no-OFED.eb
index dd7cd820906e8e0a3c29ee3687cec39003a52fbb..b4ca6871ed0a1640d0f001d4f7cff2d5b2ef21cd 100644
--- a/easybuild/easyconfigs/m/mpiBLAST/mpiBLAST-1.6.0-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/m/mpiBLAST/mpiBLAST-1.6.0-goalf-1.1.0-no-OFED.eb
@@ -34,9 +34,9 @@ patches = ['mpiBLAST_disable-ncbi-X11-apps.patch']
 buildopts = 'ncbi all'
 
 sanity_check_paths = {
-                      'files': ["bin/mpiblast"],
-                      'dirs': []
-                     }
+    'files': ["bin/mpiblast"],
+    'dirs': []
+}
 
 parallel = 1
 
diff --git a/easybuild/easyconfigs/m/mpiBLAST/mpiBLAST-1.6.0-goolf-1.4.10.eb b/easybuild/easyconfigs/m/mpiBLAST/mpiBLAST-1.6.0-goolf-1.4.10.eb
index 7996ccccb17f7944b2845e71f7684d52158681c1..273a8c9d5f3d78764ba95476a1b0345c3e1e3ee6 100644
--- a/easybuild/easyconfigs/m/mpiBLAST/mpiBLAST-1.6.0-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/m/mpiBLAST/mpiBLAST-1.6.0-goolf-1.4.10.eb
@@ -33,9 +33,9 @@ patches = ['mpiBLAST_disable-ncbi-X11-apps.patch']
 buildopts = 'ncbi all'
 
 sanity_check_paths = {
-                      'files': ["bin/mpiblast"],
-                      'dirs': []
-                     }
+    'files': ["bin/mpiblast"],
+    'dirs': []
+}
 
 parallel = 1
 
diff --git a/easybuild/easyconfigs/m/mpiBLAST/mpiBLAST-1.6.0-ictce-4.0.6.eb b/easybuild/easyconfigs/m/mpiBLAST/mpiBLAST-1.6.0-ictce-4.0.6.eb
index ed6214c594c1e1455086e22f7f7cb4adcdab4e6e..f14049a15f0565412ac712b03d72dc5a9daf4835 100644
--- a/easybuild/easyconfigs/m/mpiBLAST/mpiBLAST-1.6.0-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/m/mpiBLAST/mpiBLAST-1.6.0-ictce-4.0.6.eb
@@ -34,9 +34,9 @@ patches = ['mpiBLAST_disable-ncbi-X11-apps.patch']
 buildopts = 'ncbi all'
 
 sanity_check_paths = {
-                      'files': ["bin/mpiblast"],
-                      'dirs': []
-                     }
+    'files': ["bin/mpiblast"],
+    'dirs': []
+}
 
 parallel = 1
 
diff --git a/easybuild/easyconfigs/m/mpiBLAST/mpiBLAST-1.6.0-ictce-5.2.0.eb b/easybuild/easyconfigs/m/mpiBLAST/mpiBLAST-1.6.0-ictce-5.2.0.eb
index 61e20d40246e356d6eb54fb42fc89ef1416f540e..1bb43bc486d63198b04de31940f0815d583d58cf 100644
--- a/easybuild/easyconfigs/m/mpiBLAST/mpiBLAST-1.6.0-ictce-5.2.0.eb
+++ b/easybuild/easyconfigs/m/mpiBLAST/mpiBLAST-1.6.0-ictce-5.2.0.eb
@@ -34,9 +34,9 @@ patches = ['mpiBLAST_disable-ncbi-X11-apps.patch']
 buildopts = 'ncbi all'
 
 sanity_check_paths = {
-                      'files': ["bin/mpiblast"],
-                      'dirs': []
-                     }
+    'files': ["bin/mpiblast"],
+    'dirs': []
+}
 
 parallel = 1
 
diff --git a/easybuild/easyconfigs/m/mpiBLAST/mpiBLAST-1.6.0-ictce-5.3.0.eb b/easybuild/easyconfigs/m/mpiBLAST/mpiBLAST-1.6.0-ictce-5.3.0.eb
index 7a012e8c9b337c135b7c30db0b4cf3bdc8c9748a..58c91d09bcfaa73a523f8382b7bc85cc01d0e314 100644
--- a/easybuild/easyconfigs/m/mpiBLAST/mpiBLAST-1.6.0-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/m/mpiBLAST/mpiBLAST-1.6.0-ictce-5.3.0.eb
@@ -23,7 +23,6 @@ description = """mpiBLAST is a freely available, open-source, parallel implement
  mpiBLAST is also portable across many different platforms and operating systems."""
 
 
-
 toolchain = {'name': 'ictce', 'version': '5.3.0'}
 toolchainopts = {'pic': True, 'usempi': True}
 
@@ -36,9 +35,9 @@ patches = ['mpiBLAST_disable-ncbi-X11-apps.patch']
 buildopts = 'ncbi all'
 
 sanity_check_paths = {
-                      'files': ["bin/mpiblast"],
-                      'dirs': []
-                     }
+    'files': ["bin/mpiblast"],
+    'dirs': []
+}
 
 parallel = 1
 
diff --git a/easybuild/easyconfigs/m/mympingpong/mympingpong-0.7.0-intel-2015b-Python-2.7.11.eb b/easybuild/easyconfigs/m/mympingpong/mympingpong-0.7.0-intel-2015b-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..e243ebde5334d29f3e380cd6c9fe07e7d9518fdd
--- /dev/null
+++ b/easybuild/easyconfigs/m/mympingpong/mympingpong-0.7.0-intel-2015b-Python-2.7.11.eb
@@ -0,0 +1,33 @@
+easyblock = 'PythonPackage'
+
+name = 'mympingpong'
+version = '0.7.0'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'https://github.com/hpcugent/mympingpong'
+description = """A mpi4py based random pair pingpong network stress test."""
+
+toolchain = {'name': 'intel', 'version': '2015b'}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+vsc_base_ver = '2.4.17'
+dependencies = [
+    ('Python', '2.7.11'),
+    ('vsc-base', vsc_base_ver, versionsuffix),
+    ('vsc-mympirun', '3.4.2', versionsuffix + '-vsc-base-%s' % vsc_base_ver),
+    ('matplotlib', '1.5.1', versionsuffix),
+    ('h5py', '2.5.0', versionsuffix + '-HDF5-1.8.16'),
+    ('mpi4py', '1.3.1', versionsuffix + '-timed-pingpong'),
+    ('lxml', '3.5.0', versionsuffix),
+]
+
+options = {'modulename': 'vsc.mympingpong'}
+
+sanity_check_paths = {
+    'files': ['bin/mympingpong', 'bin/mympingponganalysis'],
+    'dirs': ['lib/python%(pyshortver)s/site-packages'],
+}
+
+moduleclass = 'perf'
diff --git a/easybuild/easyconfigs/m/mympingpong/mympingpong-0.7.0-intel-2016a-Python-2.7.11.eb b/easybuild/easyconfigs/m/mympingpong/mympingpong-0.7.0-intel-2016a-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..b5da145493d07ca5cc98f4d1b525fdd527444913
--- /dev/null
+++ b/easybuild/easyconfigs/m/mympingpong/mympingpong-0.7.0-intel-2016a-Python-2.7.11.eb
@@ -0,0 +1,33 @@
+easyblock = 'PythonPackage'
+
+name = 'mympingpong'
+version = '0.7.0'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'https://github.com/hpcugent/mympingpong'
+description = """A mpi4py based random pair pingpong network stress test."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+vsc_base_ver = '2.4.17'
+dependencies = [
+    ('Python', '2.7.11'),
+    ('vsc-base', vsc_base_ver, versionsuffix),
+    ('vsc-mympirun', '3.4.2', versionsuffix + '-vsc-base-%s' % vsc_base_ver),
+    ('matplotlib', '1.5.1', versionsuffix),
+    ('h5py', '2.5.0', versionsuffix + '-HDF5-1.8.16'),
+    ('mpi4py', '1.3.1', versionsuffix + '-timed-pingpong'),
+    ('lxml', '3.5.0', versionsuffix),
+]
+
+options = {'modulename': 'vsc.mympingpong'}
+
+sanity_check_paths = {
+    'files': ['bin/mympingpong', 'bin/mympingponganalysis'],
+    'dirs': ['lib/python%(pyshortver)s/site-packages'],
+}
+
+moduleclass = 'perf'
diff --git a/easybuild/easyconfigs/n/NASM/NASM-2.11.08-foss-2015a.eb b/easybuild/easyconfigs/n/NASM/NASM-2.11.08-foss-2015a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..54389e341593b305b74656e3ea913aa89c9e1f2f
--- /dev/null
+++ b/easybuild/easyconfigs/n/NASM/NASM-2.11.08-foss-2015a.eb
@@ -0,0 +1,31 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2012-2014 Uni.Lu/LCSB, NTUA
+# Authors::   Fotis Georgatos <fotis@cern.ch>
+# License::   MIT/GPL
+# $Id$
+#
+# This work implements a part of the HPCBIOS project and is a component of the policy:
+# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-90.html
+##
+
+easyblock = 'ConfigureMake'
+
+name = 'NASM'
+version = '2.11.08'
+
+homepage = 'http://www.nasm.us/'
+description = """NASM: General-purpose x86 assembler"""
+
+toolchain = {'name': 'foss', 'version': '2015a'}
+
+sources = [SOURCELOWER_TAR_BZ2]
+source_urls = ['http://www.nasm.us/pub/nasm/releasebuilds/%(version)s']
+
+sanity_check_paths = {
+    'files': ['bin/nasm'],
+    'dirs': [],
+}
+
+moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/n/NASM/NASM-2.11.08-gimkl-2.11.5.eb b/easybuild/easyconfigs/n/NASM/NASM-2.11.08-gimkl-2.11.5.eb
new file mode 100644
index 0000000000000000000000000000000000000000..60a507ddb83985ad1a08dc85ce34dfc209dcce27
--- /dev/null
+++ b/easybuild/easyconfigs/n/NASM/NASM-2.11.08-gimkl-2.11.5.eb
@@ -0,0 +1,31 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2012-2014 Uni.Lu/LCSB, NTUA
+# Authors::   Fotis Georgatos <fotis@cern.ch>
+# License::   MIT/GPL
+# $Id$
+#
+# This work implements a part of the HPCBIOS project and is a component of the policy:
+# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-90.html
+##
+
+easyblock = 'ConfigureMake'
+
+name = 'NASM'
+version = '2.11.08'
+
+homepage = 'http://www.nasm.us/'
+description = """NASM: General-purpose x86 assembler"""
+
+toolchain = {'name': 'gimkl', 'version': '2.11.5'}
+
+sources = [SOURCELOWER_TAR_BZ2]
+source_urls = ['http://www.nasm.us/pub/nasm/releasebuilds/%(version)s']
+
+sanity_check_paths = {
+    'files': ['bin/nasm'],
+    'dirs': [],
+}
+
+moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/n/NASM/NASM-2.11.08-goolf-1.4.10.eb b/easybuild/easyconfigs/n/NASM/NASM-2.11.08-goolf-1.4.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..617fb0352331ac77dd9f693af31014a4b577e247
--- /dev/null
+++ b/easybuild/easyconfigs/n/NASM/NASM-2.11.08-goolf-1.4.10.eb
@@ -0,0 +1,31 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2012-2014 Uni.Lu/LCSB, NTUA
+# Authors::   Fotis Georgatos <fotis@cern.ch>
+# License::   MIT/GPL
+# $Id$
+#
+# This work implements a part of the HPCBIOS project and is a component of the policy:
+# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-90.html
+##
+
+easyblock = 'ConfigureMake'
+
+name = 'NASM'
+version = '2.11.08'
+
+homepage = 'http://www.nasm.us/'
+description = """NASM: General-purpose x86 assembler"""
+
+toolchain = {'name': 'goolf', 'version': '1.4.10'}
+
+sources = [SOURCELOWER_TAR_BZ2]
+source_urls = ['http://www.nasm.us/pub/nasm/releasebuilds/%(version)s']
+
+sanity_check_paths = {
+    'files': ['bin/nasm'],
+    'dirs': [],
+}
+
+moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/n/NASM/NASM-2.11.08-intel-2016a.eb b/easybuild/easyconfigs/n/NASM/NASM-2.11.08-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..7fa10b2782207828b8c541e1e19928ccb08ec229
--- /dev/null
+++ b/easybuild/easyconfigs/n/NASM/NASM-2.11.08-intel-2016a.eb
@@ -0,0 +1,31 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2012-2014 Uni.Lu/LCSB, NTUA
+# Authors::   Fotis Georgatos <fotis@cern.ch>
+# License::   MIT/GPL
+# $Id$
+#
+# This work implements a part of the HPCBIOS project and is a component of the policy:
+# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-90.html
+##
+
+easyblock = 'ConfigureMake'
+
+name = 'NASM'
+version = '2.11.08'
+
+homepage = 'http://www.nasm.us/'
+description = """NASM: General-purpose x86 assembler"""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+sources = [SOURCELOWER_TAR_BZ2]
+source_urls = ['http://www.nasm.us/pub/nasm/releasebuilds/%(version)s']
+
+sanity_check_paths = {
+    'files': ['bin/nasm'],
+    'dirs': [],
+}
+
+moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/n/NCBI-Toolkit/NCBI-Toolkit-9.0.0-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/n/NCBI-Toolkit/NCBI-Toolkit-9.0.0-goalf-1.1.0-no-OFED.eb
index c5936a51c75235c8c76d28e187152dd88ba861eb..c4688cb405a6c9879ab9e44fbd5eb73666be1759 100644
--- a/easybuild/easyconfigs/n/NCBI-Toolkit/NCBI-Toolkit-9.0.0-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/n/NCBI-Toolkit/NCBI-Toolkit-9.0.0-goalf-1.1.0-no-OFED.eb
@@ -34,8 +34,8 @@ dependencies = [('Boost', '1.51.0')]
 configopts = '--with-boost=$EBROOTBOOST --with-64 --with-bin-release --without-debug --with-mt'
 
 sanity_check_paths = {
-                      'files': ["bin/blastn", "bin/blastp", "bin/blastx"],
-                      'dirs': []
-                     }
+    'files': ["bin/blastn", "bin/blastp", "bin/blastx"],
+    'dirs': []
+}
 
 moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/n/NCBI-Toolkit/NCBI-Toolkit-9.0.0-goolf-1.4.10.eb b/easybuild/easyconfigs/n/NCBI-Toolkit/NCBI-Toolkit-9.0.0-goolf-1.4.10.eb
index b889e9351603e87997ee1cc8eb4a97f31bf5d863..b11e19a8317bd64e59945570c9a007552371ff7c 100644
--- a/easybuild/easyconfigs/n/NCBI-Toolkit/NCBI-Toolkit-9.0.0-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/n/NCBI-Toolkit/NCBI-Toolkit-9.0.0-goolf-1.4.10.eb
@@ -33,8 +33,8 @@ dependencies = [('Boost', '1.51.0')]
 configopts = '--with-boost=$EBROOTBOOST --with-64 --with-bin-release --without-debug --with-mt'
 
 sanity_check_paths = {
-                      'files': ["bin/blastn", "bin/blastp", "bin/blastx"],
-                      'dirs': []
-                     }
+    'files': ["bin/blastn", "bin/blastp", "bin/blastx"],
+    'dirs': []
+}
 
 moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/n/NCBI-Toolkit/NCBI-Toolkit-9.0.0-ictce-4.0.6.eb b/easybuild/easyconfigs/n/NCBI-Toolkit/NCBI-Toolkit-9.0.0-ictce-4.0.6.eb
index af1e8856cf9ce236511fe2a0266b8699816fdbca..7d8e37d42dacb7b6effc2e39172dee842585cc8d 100644
--- a/easybuild/easyconfigs/n/NCBI-Toolkit/NCBI-Toolkit-9.0.0-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/n/NCBI-Toolkit/NCBI-Toolkit-9.0.0-ictce-4.0.6.eb
@@ -29,17 +29,17 @@ sources = ['ncbi_cxx--%s.tar.gz' % src_ver]
 source_urls = ['ftp://ftp.ncbi.nlm.nih.gov/toolbox/ncbi_tools++/ARCHIVE/%s' % src_ver]
 
 patches = [
-           'NCBI-Toolkit_make-install-fix.patch',
-           'NCBI-Toolkit-9.0.0_ictce-fixes.patch'
-          ]
+    'NCBI-Toolkit_make-install-fix.patch',
+    'NCBI-Toolkit-9.0.0_ictce-fixes.patch'
+]
 
 dependencies = [('Boost', '1.51.0')]
 
 configopts = '--with-boost=$EBROOTBOOST --with-64 --with-bin-release --without-debug --with-mt'
 
 sanity_check_paths = {
-                      'files': ["bin/blastn", "bin/blastp", "bin/blastx"],
-                      'dirs': []
-                     }
+    'files': ["bin/blastn", "bin/blastp", "bin/blastx"],
+    'dirs': []
+}
 
 moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/n/NCO/NCO-4.4.4-ictce-5.4.0.eb b/easybuild/easyconfigs/n/NCO/NCO-4.4.4-ictce-5.4.0.eb
index 010a358d9234751705d9c4ad1d6456c266c924a4..7fd080e24fa3cdb1ce901de0ecaf1db7d8bfaeab 100644
--- a/easybuild/easyconfigs/n/NCO/NCO-4.4.4-ictce-5.4.0.eb
+++ b/easybuild/easyconfigs/n/NCO/NCO-4.4.4-ictce-5.4.0.eb
@@ -20,9 +20,10 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files': ['bin/%s' % x for x in ['ncap2', 'ncatted', 'ncbo', 'ncdiff', 'ncea', 'ncecat', 'nces', 'ncflint',
-                                     'ncks', 'ncpdq', 'ncra', 'ncrcat', 'ncrename']],
-    'dirs': [],
+    'files': ['bin/nc%s' % x for x in ['ap2', 'atted', 'bo', 'diff', 'ea', 'ecat', 'es', 'flint',
+                                       'ks', 'pdq', 'ra', 'rcat', 'rename']] +
+             ['lib/libnco.a', 'lib/libnco.%s' % SHLIB_EXT, 'lib/libnco_c++.a', 'lib/libnco_c++.%s' % SHLIB_EXT],
+    'dirs': ['include'],
 }
 
 moduleclass = 'tools'
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 a6ab3c607d69b18398743a9750d877b215eeddf8..88f85c411095cb4be3f9cdf3de9e8fe620e253d2 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
@@ -34,7 +34,9 @@ dependencies = [
 ]
 
 sanity_check_paths = {
-    'files': ['bin/nc%s' % x for x in ('ap', 'ap2', 'atted', 'bo', 'ecat', 'flint', 'ks', 'pdq', 'ra', 'rename', 'wa')],
+    'files': ['bin/nc%s' % x for x in ('ap', 'ap2', 'atted', 'bo', 'diff', 'ea', 'ecat', 'es',
+                                       'flint', 'ks', 'pdq', 'ra', 'rcat', 'rename', 'wa')] +
+             ['lib/libnco.a', 'lib/libnco.%s' % SHLIB_EXT, 'lib/libnco_c++.a', 'lib/libnco_c++.%s' % SHLIB_EXT],
     'dirs': ['include'],
 }
 
diff --git a/easybuild/easyconfigs/n/NEMO/NEMO-3.4-r5541-ictce-6.1.5-IC3.eb b/easybuild/easyconfigs/n/NEMO/NEMO-3.4-r5541-ictce-6.1.5-IC3.eb
index 3f22d894436ef0799bd9c4092a0c7e13cebe953f..cb8f9487e8adc4178db812ff8e920be22b744ea5 100644
--- a/easybuild/easyconfigs/n/NEMO/NEMO-3.4-r5541-ictce-6.1.5-IC3.eb
+++ b/easybuild/easyconfigs/n/NEMO/NEMO-3.4-r5541-ictce-6.1.5-IC3.eb
@@ -6,7 +6,7 @@ homepage = 'http://www.nemo-ocean.eu/'
 description = """NEMO (Nucleus for European Modelling of the Ocean) is a state-of-the-art modeling framework for
  oceanographic research, operational oceanography seasonal forecast and climate studies."""
 
-toolchain = {'name': 'ictce','version': '6.1.5'}
+toolchain = {'name': 'ictce', 'version': '6.1.5'}
 toolchainopts = {'opt': False, 'optarch': False}
 
 # authenticated SVN access required
diff --git a/easybuild/easyconfigs/n/NEdit/NEdit-5.5-Linux-x86.eb b/easybuild/easyconfigs/n/NEdit/NEdit-5.5-Linux-x86.eb
index 6fc9490675bc6a1f4f4c378f6b27ac21fbd384b7..48049683384f77db933f0f645ecdb75070a54aac 100644
--- a/easybuild/easyconfigs/n/NEdit/NEdit-5.5-Linux-x86.eb
+++ b/easybuild/easyconfigs/n/NEdit/NEdit-5.5-Linux-x86.eb
@@ -12,7 +12,7 @@ description = """NEdit is a multi-purpose text editor for the X Window System,
 toolchain = {'version': 'dummy', 'name': 'dummy'}
 
 subdir = '_'.join(version.split('-')[0].split('.'))
-source_urls = ['http://ftp.vim.org/editors/NEdit/v%s/executables' % subdir ]
+source_urls = ['http://ftp.vim.org/editors/NEdit/v%s/executables' % subdir]
 sources = ['%(namelower)s-%(version)s%(versionsuffix)s.tar.gz']
 
 modextrapaths = {
diff --git a/easybuild/easyconfigs/n/NWChem/NWChem-6.3.revision2-intel-2014b-2013-10-17-Python-2.7.8.eb b/easybuild/easyconfigs/n/NWChem/NWChem-6.3.revision2-intel-2014b-2013-10-17-Python-2.7.8.eb
index 0e843ffa38f0a4d83fd26a88243bc57beea6cfef..acc8037f03ee429ea46449307efcc60a1cd4cea3 100644
--- a/easybuild/easyconfigs/n/NWChem/NWChem-6.3.revision2-intel-2014b-2013-10-17-Python-2.7.8.eb
+++ b/easybuild/easyconfigs/n/NWChem/NWChem-6.3.revision2-intel-2014b-2013-10-17-Python-2.7.8.eb
@@ -12,7 +12,7 @@ description = """NWChem aims to provide its users with computational chemistry t
 toolchain = {'name': 'intel', 'version': '2014b'}
 toolchainopts = {'i8': True}
 
-source_urls = [ 'http://www.nwchem-sw.org/download.php?f=']
+source_urls = ['http://www.nwchem-sw.org/download.php?f=']
 verdate = '2013-10-17'
 sources = ['Nwchem-%s-src.%s.tar.gz' % (version, verdate)]
 
diff --git a/easybuild/easyconfigs/n/NWChem/NWChem-6.5.revision26243-intel-2014b-2014-09-10-Python-2.7.8.eb b/easybuild/easyconfigs/n/NWChem/NWChem-6.5.revision26243-intel-2014b-2014-09-10-Python-2.7.8.eb
index 2eefc9a7f35a4bb722e574829d36ffd5702995fb..ec0a191ad4cee030e993e3a11864539a5913de93 100644
--- a/easybuild/easyconfigs/n/NWChem/NWChem-6.5.revision26243-intel-2014b-2014-09-10-Python-2.7.8.eb
+++ b/easybuild/easyconfigs/n/NWChem/NWChem-6.5.revision26243-intel-2014b-2014-09-10-Python-2.7.8.eb
@@ -12,7 +12,7 @@ description = """NWChem aims to provide its users with computational chemistry t
 toolchain = {'name': 'intel', 'version': '2014b'}
 toolchainopts = {'i8': True}
 
-source_urls = [ 'http://www.nwchem-sw.org/download.php?f=']
+source_urls = ['http://www.nwchem-sw.org/download.php?f=']
 verdate = '2014-09-10'
 sources = ['Nwchem-%s-src.%s.tar.bz2' % (version, verdate)]
 
diff --git a/easybuild/easyconfigs/n/NWChem/NWChem-6.5.revision26243-intel-2015b-2014-09-10-Python-2.7.10.eb b/easybuild/easyconfigs/n/NWChem/NWChem-6.5.revision26243-intel-2015b-2014-09-10-Python-2.7.10.eb
index 918b9ffd9a94c30f67ef628f9e887876df7d965e..cfb063858e7c510b4b07aebd878a67902ea2c16e 100644
--- a/easybuild/easyconfigs/n/NWChem/NWChem-6.5.revision26243-intel-2015b-2014-09-10-Python-2.7.10.eb
+++ b/easybuild/easyconfigs/n/NWChem/NWChem-6.5.revision26243-intel-2015b-2014-09-10-Python-2.7.10.eb
@@ -12,7 +12,7 @@ description = """NWChem aims to provide its users with computational chemistry t
 toolchain = {'name': 'intel', 'version': '2015b'}
 toolchainopts = {'i8': True}
 
-source_urls = [ 'http://www.nwchem-sw.org/download.php?f=']
+source_urls = ['http://www.nwchem-sw.org/download.php?f=']
 verdate = '2014-09-10'
 sources = ['Nwchem-%s-src.%s.tar.bz2' % (version, verdate)]
 
diff --git a/easybuild/easyconfigs/n/ncdf4/ncdf4-1.15-intel-2015a-R-3.2.1.eb b/easybuild/easyconfigs/n/ncdf4/ncdf4-1.15-intel-2015a-R-3.2.1.eb
new file mode 100644
index 0000000000000000000000000000000000000000..ea4c448508b4a8b8a9ec3e36d70a2e824b186650
--- /dev/null
+++ b/easybuild/easyconfigs/n/ncdf4/ncdf4-1.15-intel-2015a-R-3.2.1.eb
@@ -0,0 +1,31 @@
+easyblock = 'RPackage'
+
+name = 'ncdf4'
+version = '1.15'
+
+homepage = 'http://cran.r-project.org/web/packages/%(name)s'
+description = """ncdf4: Interface to Unidata netCDF (version 4 or earlier) format data files"""
+
+toolchain = {'name': 'intel', 'version': '2015a'}
+
+source_urls = [
+    'http://cran.r-project.org/src/contrib/',
+    'http://cran.r-project.org/src/contrib/Archive/$(name)s/',
+]
+sources = ['%(name)s_%(version)s.tar.gz']
+
+r = 'R'
+rver = '3.2.1'
+versionsuffix = '-%s-%s' % (r, rver)
+
+dependencies = [
+    (r, rver),
+    ('netCDF', '4.3.2'),
+]
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['ncdf4'],
+}
+
+moduleclass = 'math'
diff --git a/easybuild/easyconfigs/n/ncdf4/ncdf4-1.6.1-ictce-5.3.0-R-3.0.2-bare.eb b/easybuild/easyconfigs/n/ncdf4/ncdf4-1.6.1-ictce-5.3.0-R-3.0.2-bare.eb
index 4ef7a218bc9727a13f77d6a46daa71efb6e8cf23..cf94b3ef4d30fb1bb90f08a956800db24f26ef0f 100644
--- a/easybuild/easyconfigs/n/ncdf4/ncdf4-1.6.1-ictce-5.3.0-R-3.0.2-bare.eb
+++ b/easybuild/easyconfigs/n/ncdf4/ncdf4-1.6.1-ictce-5.3.0-R-3.0.2-bare.eb
@@ -20,7 +20,7 @@ r = 'R'
 rver = '3.0.2'
 rversuf = '-bare'
 
-versionsuffix = '-%s-%s%s' % (r, rver,rversuf)
+versionsuffix = '-%s-%s%s' % (r, rver, rversuf)
 
 dependencies = [
     (r, rver, rversuf),
diff --git a/easybuild/easyconfigs/n/ncurses/ncurses-6.0.eb b/easybuild/easyconfigs/n/ncurses/ncurses-6.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..51d2a6f5390b67287c3aac50a949cfbfdfa62761
--- /dev/null
+++ b/easybuild/easyconfigs/n/ncurses/ncurses-6.0.eb
@@ -0,0 +1,34 @@
+easyblock = 'ConfigureMake'
+
+name = 'ncurses'
+version = '6.0'
+
+homepage = 'http://www.gnu.org/software/ncurses/'
+description = """The Ncurses (new curses) library is a free software emulation of curses in System V Release 4.0,
+ and more. It uses Terminfo format, supports pads and color and multiple highlights and forms characters and
+ function-key mapping, and has all the other SYSV-curses enhancements over BSD Curses."""
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchainopts = {'optarch': True, 'pic': True}
+
+source_urls = [GNU_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+configopts = [
+    # default build
+    '--with-shared --enable-overwrite',
+    # the UTF-8 enabled version (ncursesw)
+    '--with-shared --enable-overwrite --enable-ext-colors --enable-widec --includedir=%(installdir)s/include/ncursesw/'
+]
+
+libs = ["form", "menu", "ncurses", "panel"]
+sanity_check_paths = {
+    'files': ['bin/%s' % x for x in ["captoinfo", "clear", "infocmp", "infotocap", "ncurses%(version_major)s-config",
+                                     "reset", "tabs", "tic", "toe", "tput", "tset"]] +
+             ['lib/lib%s%s.a' % (x, y) for x in libs for y in ['', '_g', 'w', 'w_g']] +
+             ['lib/lib%s%s.%s' % (x, y, SHLIB_EXT) for x in libs for y in ['', 'w']] +
+             ['lib/libncurses++%s.a' % x for x in ['', 'w']],
+    'dirs': ['include', 'include/ncursesw'],
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/n/netCDF/netCDF-4.1.3-ictce-4.1.13.eb b/easybuild/easyconfigs/n/netCDF/netCDF-4.1.3-ictce-4.1.13.eb
index 1cf87a93d6b03b8ef32c01fe8f698438edbe4114..47fa2b79af95ccdfb4c4a898e9f2bde4ffb2446d 100644
--- a/easybuild/easyconfigs/n/netCDF/netCDF-4.1.3-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/n/netCDF/netCDF-4.1.3-ictce-4.1.13.eb
@@ -7,7 +7,7 @@ description = """NetCDF (network Common Data Form) is a set of software librarie
  scientific data."""
 
 toolchain = {'name': 'ictce', 'version': '4.1.13'}
-toolchainopts = {'pic':True}
+toolchainopts = {'pic': True}
 
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = [
diff --git a/easybuild/easyconfigs/n/netCDF/netCDF-4.1.3-ictce-5.3.0.eb b/easybuild/easyconfigs/n/netCDF/netCDF-4.1.3-ictce-5.3.0.eb
index 2e121dba814b25d0730e17363cacb14e1c75bb2e..36ab674b3d8c718341c6804c8d47c20cf51727e0 100644
--- a/easybuild/easyconfigs/n/netCDF/netCDF-4.1.3-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/n/netCDF/netCDF-4.1.3-ictce-5.3.0.eb
@@ -7,7 +7,7 @@ description = """NetCDF (network Common Data Form) is a set of software librarie
  scientific data."""
 
 toolchain = {'name': 'ictce', 'version': '5.3.0'}
-toolchainopts = {'pic':True}
+toolchainopts = {'pic': True}
 
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = [
diff --git a/easybuild/easyconfigs/n/netCDF/netCDF-4.2.1.1-ictce-4.1.13-mt.eb b/easybuild/easyconfigs/n/netCDF/netCDF-4.2.1.1-ictce-4.1.13-mt.eb
index a518b2a451eaadd896c49f43988710278a7d6dcc..46676df71b009b4fd10e0e0425c2bbed423870fd 100644
--- a/easybuild/easyconfigs/n/netCDF/netCDF-4.2.1.1-ictce-4.1.13-mt.eb
+++ b/easybuild/easyconfigs/n/netCDF/netCDF-4.2.1.1-ictce-4.1.13-mt.eb
@@ -7,7 +7,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':'ictce','version':'4.1.13'}
+toolchain = {'name': 'ictce', 'version': '4.1.13'}
 toolchainopts = {'pic': True, 'openmp': True}
 
 sources = [SOURCELOWER_TAR_GZ]
diff --git a/easybuild/easyconfigs/n/netCDF/netCDF-4.2.1.1-ictce-4.1.13.eb b/easybuild/easyconfigs/n/netCDF/netCDF-4.2.1.1-ictce-4.1.13.eb
index 9caf198302785c53e936ddd4eb64d6fa6afc46ca..e5e9ad231d4a2b199d315160825149cfa088683a 100644
--- a/easybuild/easyconfigs/n/netCDF/netCDF-4.2.1.1-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/n/netCDF/netCDF-4.2.1.1-ictce-4.1.13.eb
@@ -6,8 +6,8 @@ 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':'ictce','version':'4.1.13'}
-toolchainopts = {'pic':True}
+toolchain = {'name': 'ictce', 'version': '4.1.13'}
+toolchainopts = {'pic': True}
 
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = [
diff --git a/easybuild/easyconfigs/n/netCDF/netCDF-4.3.2-foss-2014b.eb b/easybuild/easyconfigs/n/netCDF/netCDF-4.3.2-foss-2014b.eb
index f0b637b12c033d26d77ddc2ce58d0f484c7a0089..1b6d9c1fa7b68ec1cf3c98e8c9717b8e6fa51f8e 100644
--- a/easybuild/easyconfigs/n/netCDF/netCDF-4.3.2-foss-2014b.eb
+++ b/easybuild/easyconfigs/n/netCDF/netCDF-4.3.2-foss-2014b.eb
@@ -35,4 +35,3 @@ configopts = [
 ]
 
 moduleclass = 'data'
-
diff --git a/easybuild/easyconfigs/n/netCDF/netCDF-4.3.3.1-foss-2015a.eb b/easybuild/easyconfigs/n/netCDF/netCDF-4.3.3.1-foss-2015a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..67ec8a7992c10efb7c1079baef7b2840b9beded5
--- /dev/null
+++ b/easybuild/easyconfigs/n/netCDF/netCDF-4.3.3.1-foss-2015a.eb
@@ -0,0 +1,34 @@
+name = 'netCDF'
+version = '4.3.3.1'
+
+homepage = 'http://www.unidata.ucar.edu/software/netcdf/'
+description = """NetCDF (network Common Data Form) is a set of software libraries 
+ and machine-independent data formats that support the creation, access, and sharing of array-oriented 
+ scientific data."""
+
+toolchain = {'name': 'foss', 'version': '2015a'}
+toolchainopts = {'pic': True, 'usempi': True}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = [
+    'ftp://ftp.unidata.ucar.edu/pub/netcdf/',
+    'ftp://ftp.unidata.ucar.edu/pub/netcdf/old',
+]
+
+dependencies = [
+    ('HDF5', '1.8.16'),
+    ('cURL', '7.46.0'),
+]
+
+builddependencies = [
+    ('CMake', '3.4.1'),
+    ('Doxygen', '1.8.11'),
+]
+
+# make sure both static and shared libs are built
+configopts = [
+    "-DBUILD_SHARED_LIBS=OFF ",
+    "-DBUILD_SHARED_LIBS=ON ",
+]
+
+moduleclass = 'data'
diff --git a/easybuild/easyconfigs/n/netCDF/netCDF-4.3.3.1-foss-2015b.eb b/easybuild/easyconfigs/n/netCDF/netCDF-4.3.3.1-foss-2015b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..d5f3ba2170647653827be91e24f9cb6e20648eb5
--- /dev/null
+++ b/easybuild/easyconfigs/n/netCDF/netCDF-4.3.3.1-foss-2015b.eb
@@ -0,0 +1,34 @@
+name = 'netCDF'
+version = '4.3.3.1'
+
+homepage = 'http://www.unidata.ucar.edu/software/netcdf/'
+description = """NetCDF (network Common Data Form) is a set of software libraries 
+ and machine-independent data formats that support the creation, access, and sharing of array-oriented 
+ scientific data."""
+
+toolchain = {'name': 'foss', 'version': '2015b'}
+toolchainopts = {'pic': True, 'usempi': True}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = [
+    'ftp://ftp.unidata.ucar.edu/pub/netcdf/',
+    'ftp://ftp.unidata.ucar.edu/pub/netcdf/old',
+]
+
+dependencies = [
+    ('HDF5', '1.8.15-patch1'),
+    ('cURL', '7.45.0'),
+]
+
+builddependencies = [
+    ('CMake', '3.4.1'),
+    ('Doxygen', '1.8.10'),
+]
+
+# make sure both static and shared libs are built
+configopts = [
+    "-DBUILD_SHARED_LIBS=OFF ",
+    "-DBUILD_SHARED_LIBS=ON ",
+]
+
+moduleclass = 'data'
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 26ee8e7734ce8740d0171aa0c9ead68dc5d4eb03..f7783bd5764dc4336b29c4a7d6f6625f1037c8de 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
@@ -20,6 +20,6 @@ dependencies = [
 ]
 
 configopts = '--with-hwloc=$EBROOTHWLOC '      # hwloc support
-configopts += '--with-jansson=$EBROOTJANSSON ' # jansson support
+configopts += '--with-jansson=$EBROOTJANSSON '  # jansson support
 
 moduleclass = 'system'
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 71e8c66169021bf057046f5b1f8408c9ea1fd9a6..e1ffe4c74faee5784c62b66688a2703e9c1a31ee 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
@@ -17,7 +17,7 @@ dependencies = [
 ]
 
 configopts = '--with-hwloc=$EBROOTHWLOC '      # hwloc support
-configopts += '--with-jansson=$EBROOTJANSSON ' # jansson support
+configopts += '--with-jansson=$EBROOTJANSSON '  # jansson support
 
 # fi. http://www.open-mpi.org/software/netloc/v0.5/downloads/netloc-0.5.tar.gz
 source_urls = [homepage + '/v%(version_major_minor)s/downloads']
diff --git a/easybuild/easyconfigs/n/nettle/nettle-2.6-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/n/nettle/nettle-2.6-goalf-1.1.0-no-OFED.eb
index 7b56d0898ac316debb5061307ac533db37c331ac..12e680ddbd8be359e0454819e3157fa32a735caf 100644
--- a/easybuild/easyconfigs/n/nettle/nettle-2.6-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/n/nettle/nettle-2.6-goalf-1.1.0-no-OFED.eb
@@ -15,7 +15,8 @@ dependencies = [('GMP', '5.0.5')]
 
 sanity_check_paths = {
     'files': ['bin/%s' % x for x in ['nettle-hash', 'nettle-lfib-stream', 'pkcs1-conv', 'sexp-conv']] +
-             ['lib64/libhogweed.a', 'lib64/libhogweed.%s' % SHLIB_EXT, 'lib64/libnettle.a', 'lib64/libnettle.%s' % SHLIB_EXT],
+             ['lib64/libhogweed.a', 'lib64/libhogweed.%s' % SHLIB_EXT,
+              'lib64/libnettle.a', 'lib64/libnettle.%s' % SHLIB_EXT],
     'dirs': ['include/nettle'],
 }
 
diff --git a/easybuild/easyconfigs/n/nettle/nettle-2.6-goolf-1.4.10.eb b/easybuild/easyconfigs/n/nettle/nettle-2.6-goolf-1.4.10.eb
index d09168b7c84da1b8800084df6b5f722549ffb5a4..b72cd92143c5e2a4ad1f8e8c7eac415002609ccc 100644
--- a/easybuild/easyconfigs/n/nettle/nettle-2.6-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/n/nettle/nettle-2.6-goolf-1.4.10.eb
@@ -15,7 +15,8 @@ dependencies = [('GMP', '5.0.5')]
 
 sanity_check_paths = {
     'files': ['bin/%s' % x for x in ['nettle-hash', 'nettle-lfib-stream', 'pkcs1-conv', 'sexp-conv']] +
-             ['lib64/libhogweed.a', 'lib64/libhogweed.%s' % SHLIB_EXT, 'lib64/libnettle.a', 'lib64/libnettle.%s' % SHLIB_EXT],
+             ['lib64/libhogweed.a', 'lib64/libhogweed.%s' % SHLIB_EXT,
+              'lib64/libnettle.a', 'lib64/libnettle.%s' % SHLIB_EXT],
     'dirs': ['include/nettle'],
 }
 
diff --git a/easybuild/easyconfigs/n/nettle/nettle-3.1.1-GNU-4.9.3-2.25.eb b/easybuild/easyconfigs/n/nettle/nettle-3.1.1-GNU-4.9.3-2.25.eb
index d17a6ef2c2d40573471342ffbf050a8b78a7fc3a..e764834b2d0c67b53b474eb7f1ecd8b0c79cf3b8 100644
--- a/easybuild/easyconfigs/n/nettle/nettle-3.1.1-GNU-4.9.3-2.25.eb
+++ b/easybuild/easyconfigs/n/nettle/nettle-3.1.1-GNU-4.9.3-2.25.eb
@@ -20,7 +20,8 @@ dependencies = [
 
 sanity_check_paths = {
     'files': ['bin/%s' % x for x in ['nettle-hash', 'nettle-lfib-stream', 'pkcs1-conv', 'sexp-conv']] +
-             ['lib64/libhogweed.a', 'lib64/libhogweed.%s' % SHLIB_EXT, 'lib64/libnettle.a', 'lib64/libnettle.%s' % SHLIB_EXT],
+             ['lib64/libhogweed.a', 'lib64/libhogweed.%s' % SHLIB_EXT,
+              'lib64/libnettle.a', 'lib64/libnettle.%s' % SHLIB_EXT],
     'dirs': ['include/nettle'],
 }
 
diff --git a/easybuild/easyconfigs/n/nodejs/nodejs-0.10.24-goolf-1.4.10.eb b/easybuild/easyconfigs/n/nodejs/nodejs-0.10.24-goolf-1.4.10.eb
index 51c10e822daa66a50fc15f0225b991fb786ee3fe..0a34435fbed160eefe0015e5e0c4ffd182fa9d16 100644
--- a/easybuild/easyconfigs/n/nodejs/nodejs-0.10.24-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/n/nodejs/nodejs-0.10.24-goolf-1.4.10.eb
@@ -16,7 +16,7 @@ sources = ['node-v%(version)s.tar.gz']
 
 source_urls = ['http://nodejs.org/dist/v%(version)s/']
 
-dependencies = [('Python','2.7.5')]
+dependencies = [('Python', '2.7.5')]
 
 sanity_check_paths = {
     'files': ["bin/node", "bin/npm", ],
diff --git a/easybuild/easyconfigs/n/ns/ns-2.35-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/n/ns/ns-2.35-goalf-1.1.0-no-OFED.eb
index 174f9bf7e2e71137c4e7f2186120e619904dfc71..29818dfb059187edac51712e9cfb8c285798d959 100644
--- a/easybuild/easyconfigs/n/ns/ns-2.35-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/n/ns/ns-2.35-goalf-1.1.0-no-OFED.eb
@@ -20,7 +20,7 @@ dependencies = [
     ('Tcl', tcl_ver),
     ('Tk', tcl_ver),
     ('otcl', '1.14'),
-    ('tclcl' , '1.20'),
+    ('tclcl', '1.20'),
 ]
 
 configopts = "--with-otcl=$EBROOTOTCL --with-tcl=$EBROOTTCL --with-tcl-ver=$EBVERSIONTCL "
diff --git a/easybuild/easyconfigs/n/ns/ns-2.35-goolf-1.4.10.eb b/easybuild/easyconfigs/n/ns/ns-2.35-goolf-1.4.10.eb
index 057d7763d549f1ea77b376e33aea91a6879a8771..860b1cd2b34832b155506795174e97364125616f 100644
--- a/easybuild/easyconfigs/n/ns/ns-2.35-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/n/ns/ns-2.35-goolf-1.4.10.eb
@@ -22,7 +22,7 @@ dependencies = [
     ('Tcl', tcl_ver),
     ('Tk', tcl_ver),
     ('otcl', '1.14'),
-    ('tclcl' , '1.20'),
+    ('tclcl', '1.20'),
 ]
 
 configopts = "--with-otcl=$EBROOTOTCL --with-tcl=$EBROOTTCL --with-tcl-ver=$EBVERSIONTCL "
diff --git a/easybuild/easyconfigs/n/ns/ns-2.35-ictce-5.3.0.eb b/easybuild/easyconfigs/n/ns/ns-2.35-ictce-5.3.0.eb
index ded8fdd51cbc55db0025193a11f9947c1773e97a..ddad23bdff8115c273f5247efadd34e39614bbda 100644
--- a/easybuild/easyconfigs/n/ns/ns-2.35-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/n/ns/ns-2.35-ictce-5.3.0.eb
@@ -22,7 +22,7 @@ dependencies = [
     ('Tcl', tcl_ver),
     ('Tk', tcl_ver),
     ('otcl', '1.14'),
-    ('tclcl' , '1.20'),
+    ('tclcl', '1.20'),
 ]
 
 configopts = "--with-otcl=$EBROOTOTCL --with-tcl=$EBROOTTCL --with-tcl-ver=$EBVERSIONTCL "
diff --git a/easybuild/easyconfigs/n/numba/numba-0.22.1-intel-2015b-Python-2.7.11.eb b/easybuild/easyconfigs/n/numba/numba-0.22.1-intel-2015b-Python-2.7.11.eb
index adad31edb77f8af8bbc656295e9f60233ebe3a7d..402bb7ef969fdd459475ac8118a497a77ba559e3 100644
--- a/easybuild/easyconfigs/n/numba/numba-0.22.1-intel-2015b-Python-2.7.11.eb
+++ b/easybuild/easyconfigs/n/numba/numba-0.22.1-intel-2015b-Python-2.7.11.eb
@@ -14,7 +14,7 @@ exts_defaultclass = 'PythonPackage'
 exts_filter = ('python -c "import %(ext_name)s"', '')
 
 pyver = '2.7.11'
-versionsuffix=  '-Python-%s' % pyver
+versionsuffix = '-Python-%s' % pyver
 dependencies = [
     ('Python', pyver),
     ('LLVM', '3.6.2'),
diff --git a/easybuild/easyconfigs/n/numexpr/numexpr-2.0.1-ictce-4.1.13-Python-2.7.3.eb b/easybuild/easyconfigs/n/numexpr/numexpr-2.0.1-ictce-4.1.13-Python-2.7.3.eb
index 4606d670d05b5a88f418c7248931b92837505b8d..b59dd7b4f3f89db7b250251393124d3e06306c7d 100644
--- a/easybuild/easyconfigs/n/numexpr/numexpr-2.0.1-ictce-4.1.13-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/n/numexpr/numexpr-2.0.1-ictce-4.1.13-Python-2.7.3.eb
@@ -21,14 +21,14 @@ pythonshortver = '.'.join(pythonver.split('.')[0:2])
 versionsuffix = '-%s-%s' % (python, pythonver)
 
 dependencies = [
-                (python, pythonver),
-                ('HDF5', '1.8.10', '-gpfs')
-               ]
+    (python, pythonver),
+    ('HDF5', '1.8.10', '-gpfs')
+]
 
 eggname = '%s-%s-py%s-linux-x86_64.egg' % (name, version, pythonshortver)
 sanity_check_paths = {
-                      'files': [],
-                      'dirs': ['lib/python%s/site-packages/%s/%s' % (pythonshortver, eggname, name)]
-                     }
+    'files': [],
+    'dirs': ['lib/python%s/site-packages/%s/%s' % (pythonshortver, eggname, name)]
+}
 
 moduleclass = 'math'
diff --git a/easybuild/easyconfigs/n/numexpr/numexpr-2.0.1-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/n/numexpr/numexpr-2.0.1-ictce-5.3.0-Python-2.7.3.eb
index 23dc125463021077a2cfff1002ee314471a575f8..0f252858359e4432fd80c6b4a681fbb48793f9df 100644
--- a/easybuild/easyconfigs/n/numexpr/numexpr-2.0.1-ictce-5.3.0-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/n/numexpr/numexpr-2.0.1-ictce-5.3.0-Python-2.7.3.eb
@@ -21,14 +21,14 @@ pythonshortver = '.'.join(pythonver.split('.')[0:2])
 versionsuffix = '-%s-%s' % (python, pythonver)
 
 dependencies = [
-                (python, pythonver),
-                ('HDF5', '1.8.10', '-gpfs')
-               ]
+    (python, pythonver),
+    ('HDF5', '1.8.10', '-gpfs')
+]
 
 eggname = '%s-%s-py%s-linux-x86_64.egg' % (name, version, pythonshortver)
 sanity_check_paths = {
-                      'files': [],
-                      'dirs': ['lib/python%s/site-packages/%s/%s' % (pythonshortver, eggname, name)]
-                     }
+    'files': [],
+    'dirs': ['lib/python%s/site-packages/%s/%s' % (pythonshortver, eggname, name)]
+}
 
 moduleclass = 'math'
diff --git a/easybuild/easyconfigs/n/numpy/numpy-1.10.1-intel-2015b-Python-2.7.10.eb b/easybuild/easyconfigs/n/numpy/numpy-1.10.1-intel-2015b-Python-2.7.10.eb
index 49bbddc67863bbf2b14572e4110e06412a897b5e..8d802d968f5453d2ea94bce0505a2e014075b426 100644
--- a/easybuild/easyconfigs/n/numpy/numpy-1.10.1-intel-2015b-Python-2.7.10.eb
+++ b/easybuild/easyconfigs/n/numpy/numpy-1.10.1-intel-2015b-Python-2.7.10.eb
@@ -13,7 +13,10 @@ toolchain = {'name': 'intel', 'version': '2015b'}
 source_urls = [SOURCEFORGE_SOURCE]
 sources = [SOURCE_TAR_GZ]
 
-patches = ['numpy-1.8.0-mkl.patch']
+patches = [
+    'numpy-1.8.0-mkl.patch',
+    'numpy-%(version)s-sse42.patch',
+]
 
 python = 'Python'
 pyver = '2.7.10'
diff --git a/easybuild/easyconfigs/n/numpy/numpy-1.10.1-sse42.patch b/easybuild/easyconfigs/n/numpy/numpy-1.10.1-sse42.patch
new file mode 100644
index 0000000000000000000000000000000000000000..60cdd9673149e148738b4937babc6eff138f2645
--- /dev/null
+++ b/easybuild/easyconfigs/n/numpy/numpy-1.10.1-sse42.patch
@@ -0,0 +1,25 @@
+#Remove hard coded -xSSE4.2 compilation flag for Intel compilers (add the usual -xHOST)
+#compilation would fail on non-SSE4.2 CPUs, and for further CPUs/compilers it would restrict the generated code to SSE4.2
+# February 19th, 2016 by B. Hajgato - Free University Brussels (VUB)
+--- numpy/distutils/intelccompiler.py.orig	2015-10-12 16:29:01.000000000 +0200
++++ numpy/distutils/intelccompiler.py	2016-02-23 11:31:50.350422787 +0100
+@@ -49,7 +49,7 @@
+     def __init__(self, verbose=0, dry_run=0, force=0):
+         UnixCCompiler.__init__(self, verbose, dry_run, force)
+         self.cc_exe = ('icc -m64 -fPIC -fp-model strict -O3 '
+-                       '-fomit-frame-pointer -openmp -xSSE4.2')
++                       '-fomit-frame-pointer -openmp -xHOST')
+         compiler = self.cc_exe
+         self.set_executables(compiler=compiler,
+                              compiler_so=compiler,
+--- numpy/distutils/fcompiler/intel.py.orig	2015-10-12 16:29:01.000000000 +0200
++++ numpy/distutils/fcompiler/intel.py	2016-02-23 11:31:50.350422787 +0100
+@@ -123,7 +123,7 @@
+         return ['-openmp -fp-model strict']
+ 
+     def get_flags_arch(self):
+-        return ['-xSSE4.2']
++        return ['-xHOST']
+ 
+ # Is there no difference in the version string between the above compilers
+ # and the Visual compilers?
diff --git a/easybuild/easyconfigs/n/numpy/numpy-1.10.4-intel-2015b-Python-2.7.10.eb b/easybuild/easyconfigs/n/numpy/numpy-1.10.4-intel-2015b-Python-2.7.10.eb
index db4b5f54bff4b93f2d54361b1a1360f2566fc122..a7d1f53ad328c94080f3045fa67fafdea52dc541 100644
--- a/easybuild/easyconfigs/n/numpy/numpy-1.10.4-intel-2015b-Python-2.7.10.eb
+++ b/easybuild/easyconfigs/n/numpy/numpy-1.10.4-intel-2015b-Python-2.7.10.eb
@@ -13,7 +13,10 @@ toolchain = {'name': 'intel', 'version': '2015b'}
 source_urls = [SOURCEFORGE_SOURCE]
 sources = [SOURCE_TAR_GZ]
 
-patches = ['numpy-1.8.0-mkl.patch']
+patches = [
+    'numpy-1.8.0-mkl.patch',
+    'numpy-%(version)s-sse42.patch',
+]
 
 python = 'Python'
 pyver = '2.7.10'
diff --git a/easybuild/easyconfigs/n/numpy/numpy-1.10.4-intel-2016a-Python-2.7.11.eb b/easybuild/easyconfigs/n/numpy/numpy-1.10.4-intel-2016a-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..62945ed9381c78133fe5415e31836427dab50bab
--- /dev/null
+++ b/easybuild/easyconfigs/n/numpy/numpy-1.10.4-intel-2016a-Python-2.7.11.eb
@@ -0,0 +1,26 @@
+name = 'numpy'
+version = '1.10.4'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'http://www.numpy.org'
+description = """NumPy is the fundamental package for scientific computing with Python. It contains among other things:
+ a powerful N-dimensional array object, sophisticated (broadcasting) functions, tools for integrating C/C++ and Fortran
+ code, useful linear algebra, Fourier transform, and random number capabilities. Besides its obvious scientific uses,
+ NumPy can also be used as an efficient multi-dimensional container of generic data. Arbitrary data-types can be 
+ defined. This allows NumPy to seamlessly and speedily integrate with a wide variety of databases."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+source_urls = [SOURCEFORGE_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+patches = [
+    'numpy-1.8.0-mkl.patch',
+    'numpy-%(version)s-sse42.patch',
+]
+
+dependencies = [
+    ('Python', '2.7.11'),
+]
+
+moduleclass = 'math'
diff --git a/easybuild/easyconfigs/n/numpy/numpy-1.10.4-sse42.patch b/easybuild/easyconfigs/n/numpy/numpy-1.10.4-sse42.patch
new file mode 100644
index 0000000000000000000000000000000000000000..75ffeaa0d5939995de089410a1dd77d8bce4e74c
--- /dev/null
+++ b/easybuild/easyconfigs/n/numpy/numpy-1.10.4-sse42.patch
@@ -0,0 +1,25 @@
+#Remove hard coded -xSSE4.2 compilation flag for Intel compilers (add the usual -xHOST)
+#compilation would fail on non-SSE4.2 CPUs, and for further CPUs/compilers it would restrict the generated code to SSE4.2
+# February 19th, 2016 by B. Hajgato - Free University Brussels (VUB)
+--- ./numpy/distutils/intelccompiler.py.orig	2016-01-06 22:07:54.000000000 +0100
++++ ./numpy/distutils/intelccompiler.py	2016-02-19 15:07:00.438235792 +0100
+@@ -54,7 +54,7 @@
+     def __init__(self, verbose=0, dry_run=0, force=0):
+         UnixCCompiler.__init__(self, verbose, dry_run, force)
+         self.cc_exe = ('icc -m64 -fPIC -fp-model strict -O3 '
+-                       '-fomit-frame-pointer -openmp -xSSE4.2')
++                       '-fomit-frame-pointer -openmp -xHOST')
+         compiler = self.cc_exe
+         if platform.system() == 'Darwin':
+             shared_flag = '-Wl,-undefined,dynamic_lookup'
+--- ./numpy/distutils/fcompiler/intel.py.orig	2016-01-07 03:16:25.000000000 +0100
++++ ./numpy/distutils/fcompiler/intel.py	2016-02-19 15:07:16.424220745 +0100
+@@ -123,7 +123,7 @@
+         return ['-openmp -fp-model strict']
+ 
+     def get_flags_arch(self):
+-        return ['-xSSE4.2']
++        return ['-xHOST']
+ 
+ # Is there no difference in the version string between the above compilers
+ # and the Visual compilers?
diff --git a/easybuild/easyconfigs/o/OCaml/OCaml-4.01.0-goolf-1.4.10.eb b/easybuild/easyconfigs/o/OCaml/OCaml-4.01.0-goolf-1.4.10.eb
index 44fd054d5f92696327828d498390999e6c3166df..0a78e38ade3221c55f36951e39e6afe42efefbfe 100644
--- a/easybuild/easyconfigs/o/OCaml/OCaml-4.01.0-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/o/OCaml/OCaml-4.01.0-goolf-1.4.10.eb
@@ -6,11 +6,8 @@
 # License::   MIT/GPL
 # $Id$
 ##
-
-easyblock = 'ConfigureMake'
-
-name = "OCaml"
-version = "4.01.0"
+name = 'OCaml'
+version = '4.01.0'
 
 homepage = 'http://ocaml.org/'
 description = """OCaml is a general purpose industrial-strength programming language
@@ -18,24 +15,34 @@ description = """OCaml is a general purpose industrial-strength programming lang
  it benefits from one of the most advanced type systems and supports functional,
  imperative and object-oriented styles of programming."""
 
-toolchain = {'version': '1.4.10', 'name': 'goolf'}
-
-sources = [SOURCELOWER_TAR_GZ]
-sourcedir = name.lower() + '-' + '.'.join(version.split('.')[0:-1])
-source_urls = ['http://caml.inria.fr/pub/distrib/%s' % sourcedir]
-
-builddependencies = [('Autoconf', '2.69')]
-dependencies = [('ncurses', '5.9')]
-
-prefix_opt = "-prefix "
-buildopts = "world.opt"
+toolchain = {'name': 'goolf', 'version': '1.4.10'}
+
+opam_ver = '1.2.2'
+source_urls = [
+    'http://caml.inria.fr/pub/distrib/ocaml-%s' % '.'.join(version.split('.')[:2]),
+    'https://github.com/ocaml/opam/releases/download/%s' % opam_ver,
+]
+sources = [
+    SOURCELOWER_TAR_GZ,
+    'opam-full-%s.tar.gz' % opam_ver,
+]
+
+builddependencies = [('Autotools', '20150215', '', ('GCC', '4.7.2'))]
+dependencies = [
+    ('ncurses', '5.9'),
+    ('libreadline', '6.3'),
+    ('GSL', '1.16'),
+]
 
 # parallel build tends to break
 parallel = 1
 
-sanity_check_paths = {
-    'files': ["bin/ocaml", "bin/ocamlc"],
-    'dirs': []
-}
+# handled by OPAM, order matters!
+exts_list = [
+    ('ocamlfind', '1.5.5'),
+    ('batteries', '2.3.1'),
+    ('ocaml+twt', '0.94.0'),
+    ('gsl', '1.18.5'),
+]
 
 moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/o/OCaml/OCaml-4.01.0-ictce-5.5.0.eb b/easybuild/easyconfigs/o/OCaml/OCaml-4.01.0-ictce-5.5.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..eb591f01b3856b65130b88688d4d56f92efad8cd
--- /dev/null
+++ b/easybuild/easyconfigs/o/OCaml/OCaml-4.01.0-ictce-5.5.0.eb
@@ -0,0 +1,50 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2012-2014 Uni.Lu/LCSB, NTUA
+# Authors::   Fotis Georgatos <fotis@cern.ch>
+# License::   MIT/GPL
+# $Id$
+##
+name = 'OCaml'
+version = '4.01.0'
+
+homepage = 'http://ocaml.org/'
+description = """OCaml is a general purpose industrial-strength programming language
+ with an emphasis on expressiveness and safety. Developed for more than 20 years at Inria
+ it benefits from one of the most advanced type systems and supports functional,
+ imperative and object-oriented styles of programming."""
+
+toolchain = {'name': 'ictce', 'version': '5.5.0'}
+
+opam_ver = '1.2.2'
+source_urls = [
+    'http://caml.inria.fr/pub/distrib/ocaml-%s' % '.'.join(version.split('.')[:2]),
+    'https://github.com/ocaml/opam/releases/download/%s' % opam_ver,
+]
+sources = [
+    SOURCELOWER_TAR_GZ,
+    'opam-full-%s.tar.gz' % opam_ver,
+]
+
+patches = ['OCaml-%(version)s_icc-fixes.patch']
+
+builddependencies = [('Autotools', '20150215')]
+dependencies = [
+    ('ncurses', '5.9'),
+    ('libreadline', '6.2'),
+    ('GSL', '1.16'),
+]
+
+# parallel build tends to break
+parallel = 1
+
+# handled by OPAM, order matters!
+exts_list = [
+    ('ocamlfind', '1.5.5'),
+    ('batteries', '2.3.1'),
+    ('ocaml+twt', '0.94.0'),
+    ('gsl', '1.18.5'),
+]
+
+moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/o/OCaml/OCaml-4.01.0_icc-fixes.patch b/easybuild/easyconfigs/o/OCaml/OCaml-4.01.0_icc-fixes.patch
new file mode 100644
index 0000000000000000000000000000000000000000..3b6ab1f097559b8b2514a1b71ada6d5e6b610026
--- /dev/null
+++ b/easybuild/easyconfigs/o/OCaml/OCaml-4.01.0_icc-fixes.patch
@@ -0,0 +1,22 @@
+fix for Fatal error: exception Invalid_argument("gettimeofday not implemented")
+author: Kenneth Hoste (HPC-UGent)
+--- configure.orig	2015-10-06 10:19:12.763826416 +0200
++++ configure	2015-10-06 10:19:56.005026703 +0200
+@@ -1015,7 +1015,7 @@
+ fi
+ 
+ has_select=no
+-if sh ./hasgot select && \
++if cc="$cc -wd165" sh ./hasgot select && \
+    sh ./hasgot -i sys/types.h $select_include -t fd_set ; then
+   echo "select() found."
+   echo "#define HAS_SELECT" >> s.h
+@@ -1084,7 +1084,7 @@
+ fi
+ 
+ has_gettimeofday=no
+-if sh ./hasgot gettimeofday; then
++if cc="$cc -wd165" sh ./hasgot gettimeofday; then
+   echo "gettimeofday() found."
+   echo "#define HAS_GETTIMEOFDAY" >> s.h
+   has_gettimeofday="yes"
diff --git a/easybuild/easyconfigs/o/OCaml/OCaml-4.02.3-foss-2015a.eb b/easybuild/easyconfigs/o/OCaml/OCaml-4.02.3-foss-2015a.eb
index ed1f2013570768df34a002661d7fb30a9e4f3645..12dba48bf0852df7c4f031968e2f5d00248d13a4 100644
--- a/easybuild/easyconfigs/o/OCaml/OCaml-4.02.3-foss-2015a.eb
+++ b/easybuild/easyconfigs/o/OCaml/OCaml-4.02.3-foss-2015a.eb
@@ -17,10 +17,9 @@ description = """OCaml is a general purpose industrial-strength programming lang
 
 toolchain = {'name': 'foss', 'version': '2015a'}
 
-ocaml_sourcedir = name.lower() + '-' + '.'.join(version.split('.')[0:-1])
 opam_ver = '1.2.2'
 source_urls = [
-    'http://caml.inria.fr/pub/distrib/%s' % ocaml_sourcedir,
+    'http://caml.inria.fr/pub/distrib/ocaml-%s' % '.'.join(version.split('.')[:2]),
     'https://github.com/ocaml/opam/releases/download/%s' % opam_ver,
 ]
 sources = [
diff --git a/easybuild/easyconfigs/o/ORCA/ORCA-2_9_1-linux_x86-64.eb b/easybuild/easyconfigs/o/ORCA/ORCA-2_9_1-linux_x86-64.eb
index 76be1035a71a1775d6ba7874dd07b9869c018def..ae7ad64f4dfc72b3226a1015a7de0c9f3de7b4cd 100644
--- a/easybuild/easyconfigs/o/ORCA/ORCA-2_9_1-linux_x86-64.eb
+++ b/easybuild/easyconfigs/o/ORCA/ORCA-2_9_1-linux_x86-64.eb
@@ -17,15 +17,15 @@ sources = ['%%(namelower)s_%s_%s.tbz' % (version.split('-')[0], '-'.join(version
 dependencies = [('OpenMPI', '1.4.5', '-no-OFED', ('GCC', '4.6.3'))]
 
 sanity_check_paths = {
-    'files': ['orca_%s%s' % (x,y) for x in ['anoint', 'casscf', 'cis', 'cleanup', 'cpscf',
-                                            'eprnmr', 'gtoint', 'mdci', 'mp2', 'mrci', 'pc',
-                                            'rocis', 'scf', 'scfgrad', 'soc']
-                                  for y in ["", "_mpi"]] + \
-             ['orca_%s' % x for x in ['2mkl', 'asa', 'chelpg', 'ciprep', 'eca', 'ecplib',
-                                      'euler', 'fci', 'fitpes', 'gstep', 'loc', 'mapspc',
+    'files': ['orca_%s%s' % (x, y) for x in ['anoint', 'casscf', 'cis', 'cleanup', 'cpscf',
+                                             'eprnmr', 'gtoint', 'mdci', 'mp2', 'mrci', 'pc',
+                                             'rocis', 'scf', 'scfgrad', 'soc']
+              for y in ["", "_mpi"]] +
+    ['orca_%s' % x for x in ['2mkl', 'asa', 'chelpg', 'ciprep', 'eca', 'ecplib',
+                             'euler', 'fci', 'fitpes', 'gstep', 'loc', 'mapspc',
                                       'md', 'mergefrag', 'ndoint', 'numfreq', 'plot',
-                                      'pltvib', 'pop', 'rel', 'vib', 'vpot']] + \
-             ['orca', 'otool_cosmo'],
+                                      'pltvib', 'pop', 'rel', 'vib', 'vpot']] +
+    ['orca', 'otool_cosmo'],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/o/ORCA/ORCA-3_0_0-linux_x86-64_openmpi_165.eb b/easybuild/easyconfigs/o/ORCA/ORCA-3_0_0-linux_x86-64_openmpi_165.eb
index 3b66a977f733d9c5ee518cb229bf4a32f2f72920..1944afede80fa49c403786a6860f6535e6478eb2 100644
--- a/easybuild/easyconfigs/o/ORCA/ORCA-3_0_0-linux_x86-64_openmpi_165.eb
+++ b/easybuild/easyconfigs/o/ORCA/ORCA-3_0_0-linux_x86-64_openmpi_165.eb
@@ -18,15 +18,15 @@ sources = ['%%(namelower)s_%s_%s.tbz' % (version.split('-')[0], '-'.join(version
 dependencies = [('OpenMPI', openmpiversion, '-GCC-4.7.2')]
 
 sanity_check_paths = {
-    'files': ['orca_%s%s' % (x,y) for x in ['anoint', 'casscf', 'cis', 'cleanup', 'cpscf',
-                                            'eprnmr', 'gtoint', 'mdci', 'mp2', 'mrci', 'pc',
-                                            'rocis', 'scf', 'scfgrad', 'soc']
-                                  for y in ["", "_mpi"]] + \
-             ['orca_%s' % x for x in ['2mkl', 'asa', 'chelpg', 'ciprep', 'eca', 'ecplib',
-                                      'euler', 'fci', 'fitpes', 'gstep', 'loc', 'mapspc',
+    'files': ['orca_%s%s' % (x, y) for x in ['anoint', 'casscf', 'cis', 'cleanup', 'cpscf',
+                                             'eprnmr', 'gtoint', 'mdci', 'mp2', 'mrci', 'pc',
+                                             'rocis', 'scf', 'scfgrad', 'soc']
+              for y in ["", "_mpi"]] +
+    ['orca_%s' % x for x in ['2mkl', 'asa', 'chelpg', 'ciprep', 'eca', 'ecplib',
+                             'euler', 'fci', 'fitpes', 'gstep', 'loc', 'mapspc',
                                       'md', 'mergefrag', 'ndoint', 'numfreq', 'plot',
-                                      'pltvib', 'pop', 'rel', 'vib', 'vpot']] + \
-             ['orca', 'otool_cosmo'],
+                                      'pltvib', 'pop', 'rel', 'vib', 'vpot']] +
+    ['orca', 'otool_cosmo'],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/o/ORCA/ORCA-3_0_2-linux_x86-64-OpenMPI-1.6.5.eb b/easybuild/easyconfigs/o/ORCA/ORCA-3_0_2-linux_x86-64-OpenMPI-1.6.5.eb
index c63048d89b439b8208e9070e7e8060f9300dc962..7c21787b12bb985b11e887ccaec083059fefbe95 100644
--- a/easybuild/easyconfigs/o/ORCA/ORCA-3_0_2-linux_x86-64-OpenMPI-1.6.5.eb
+++ b/easybuild/easyconfigs/o/ORCA/ORCA-3_0_2-linux_x86-64-OpenMPI-1.6.5.eb
@@ -20,15 +20,15 @@ sources = ['%%(namelower)s_%s_%s.tbz' % (version.split('-')[0], '-'.join(version
 dependencies = [('OpenMPI', openmpiversion, '-GCC-4.7.2')]
 
 sanity_check_paths = {
-    'files': ['orca_%s%s' % (x,y) for x in ['anoint', 'casscf', 'cis', 'cleanup', 'cpscf',
-                                            'eprnmr', 'gtoint', 'mdci', 'mp2', 'mrci', 'pc',
-                                            'rocis', 'scf', 'scfgrad', 'soc']
-                                  for y in ["", "_mpi"]] + \
-             ['orca_%s' % x for x in ['2mkl', 'asa', 'chelpg', 'ciprep', 'eca', 'ecplib',
-                                      'euler', 'fci', 'fitpes', 'gstep', 'loc', 'mapspc',
+    'files': ['orca_%s%s' % (x, y) for x in ['anoint', 'casscf', 'cis', 'cleanup', 'cpscf',
+                                             'eprnmr', 'gtoint', 'mdci', 'mp2', 'mrci', 'pc',
+                                             'rocis', 'scf', 'scfgrad', 'soc']
+              for y in ["", "_mpi"]] +
+    ['orca_%s' % x for x in ['2mkl', 'asa', 'chelpg', 'ciprep', 'eca', 'ecplib',
+                             'euler', 'fci', 'fitpes', 'gstep', 'loc', 'mapspc',
                                       'md', 'mergefrag', 'ndoint', 'numfreq', 'plot',
-                                      'pltvib', 'pop', 'rel', 'vib', 'vpot']] + \
-             ['orca', 'otool_cosmo'],
+                                      'pltvib', 'pop', 'rel', 'vib', 'vpot']] +
+    ['orca', 'otool_cosmo'],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/o/ORCA/ORCA-3_0_2-linux_x86-64-OpenMPI-1.8.1.eb b/easybuild/easyconfigs/o/ORCA/ORCA-3_0_2-linux_x86-64-OpenMPI-1.8.1.eb
index 5a28bbce0d282f0b23bccc0668241df3f270718b..4c7272b6aad7a364696db4c4a5150cf3ee9c1098 100644
--- a/easybuild/easyconfigs/o/ORCA/ORCA-3_0_2-linux_x86-64-OpenMPI-1.8.1.eb
+++ b/easybuild/easyconfigs/o/ORCA/ORCA-3_0_2-linux_x86-64-OpenMPI-1.8.1.eb
@@ -20,15 +20,15 @@ sources = ['%%(namelower)s_%s_%s.tbz' % (version.split('-')[0], '-'.join(version
 dependencies = [('OpenMPI', openmpiversion, '-GCC-4.8.3')]
 
 sanity_check_paths = {
-    'files': ['orca_%s%s' % (x,y) for x in ['anoint', 'casscf', 'cis', 'cleanup', 'cpscf',
-                                            'eprnmr', 'gtoint', 'mdci', 'mp2', 'mrci', 'pc',
-                                            'rocis', 'scf', 'scfgrad', 'soc']
-                                  for y in ["", "_mpi"]] + \
-             ['orca_%s' % x for x in ['2mkl', 'asa', 'chelpg', 'ciprep', 'eca', 'ecplib',
-                                      'euler', 'fci', 'fitpes', 'gstep', 'loc', 'mapspc',
+    'files': ['orca_%s%s' % (x, y) for x in ['anoint', 'casscf', 'cis', 'cleanup', 'cpscf',
+                                             'eprnmr', 'gtoint', 'mdci', 'mp2', 'mrci', 'pc',
+                                             'rocis', 'scf', 'scfgrad', 'soc']
+              for y in ["", "_mpi"]] +
+    ['orca_%s' % x for x in ['2mkl', 'asa', 'chelpg', 'ciprep', 'eca', 'ecplib',
+                             'euler', 'fci', 'fitpes', 'gstep', 'loc', 'mapspc',
                                       'md', 'mergefrag', 'ndoint', 'numfreq', 'plot',
-                                      'pltvib', 'pop', 'rel', 'vib', 'vpot']] + \
-             ['orca', 'otool_cosmo'],
+                                      'pltvib', 'pop', 'rel', 'vib', 'vpot']] +
+    ['orca', 'otool_cosmo'],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/o/ORCA/ORCA-3_0_3-linux_x86-64-OpenMPI-1.6.5.eb b/easybuild/easyconfigs/o/ORCA/ORCA-3_0_3-linux_x86-64-OpenMPI-1.6.5.eb
index b63bd53de93fbc669e38bd893ccfd8b25f1323ed..30c44ae3d4a53b940427c3db8d2a2a922fbb33d8 100644
--- a/easybuild/easyconfigs/o/ORCA/ORCA-3_0_3-linux_x86-64-OpenMPI-1.6.5.eb
+++ b/easybuild/easyconfigs/o/ORCA/ORCA-3_0_3-linux_x86-64-OpenMPI-1.6.5.eb
@@ -20,15 +20,15 @@ sources = ['%%(namelower)s_%s_%s.tbz' % (version.split('-')[0], '-'.join(version
 dependencies = [('OpenMPI', openmpiversion, '-GCC-4.7.2')]
 
 sanity_check_paths = {
-    'files': ['orca_%s%s' % (x,y) for x in ['anoint', 'casscf', 'cis', 'cleanup', 'cpscf',
-                                            'eprnmr', 'gtoint', 'mdci', 'mp2', 'mrci', 'pc',
-                                            'rocis', 'scf', 'scfgrad', 'soc']
-                                  for y in ["", "_mpi"]] + \
-             ['orca_%s' % x for x in ['2mkl', 'asa', 'chelpg', 'ciprep', 'eca', 'ecplib',
-                                      'euler', 'fci', 'fitpes', 'gstep', 'loc', 'mapspc',
+    'files': ['orca_%s%s' % (x, y) for x in ['anoint', 'casscf', 'cis', 'cleanup', 'cpscf',
+                                             'eprnmr', 'gtoint', 'mdci', 'mp2', 'mrci', 'pc',
+                                             'rocis', 'scf', 'scfgrad', 'soc']
+              for y in ["", "_mpi"]] +
+    ['orca_%s' % x for x in ['2mkl', 'asa', 'chelpg', 'ciprep', 'eca', 'ecplib',
+                             'euler', 'fci', 'fitpes', 'gstep', 'loc', 'mapspc',
                                       'md', 'mergefrag', 'ndoint', 'numfreq', 'plot',
-                                      'pltvib', 'pop', 'rel', 'vib', 'vpot']] + \
-             ['orca', 'otool_cosmo'],
+                                      'pltvib', 'pop', 'rel', 'vib', 'vpot']] +
+    ['orca', 'otool_cosmo'],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/o/Oases/Oases-0.2.08-goolf-1.4.10.eb b/easybuild/easyconfigs/o/Oases/Oases-0.2.08-goolf-1.4.10.eb
index bc720f2ad434687014584ce4e4e7e8a28b6fab6f..d34174340c21b01fdcfc7a12d2c39a51e37adeba 100644
--- a/easybuild/easyconfigs/o/Oases/Oases-0.2.08-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/o/Oases/Oases-0.2.08-goolf-1.4.10.eb
@@ -33,9 +33,9 @@ source_urls = [
 # listed make targets exclude 'doc' on purpose
 buildopts = ['VELVET_DIR=../velvet_%s cleanobj velvet oases' % velvetver]
 
-files_to_copy = [(["oases"],'bin'), "data", "scripts", "src", "doc", "LICENSE.txt", "README.txt"]
+files_to_copy = [(["oases"], 'bin'), "data", "scripts", "src", "doc", "LICENSE.txt", "README.txt"]
 
-sanity_check_paths={
+sanity_check_paths = {
     'files': ["bin/oases", "LICENSE.txt", "README.txt"],
     'dirs': ["data", "scripts", "src", "doc"]
 }
diff --git a/easybuild/easyconfigs/o/Oases/Oases-0.2.08-ictce-5.3.0.eb b/easybuild/easyconfigs/o/Oases/Oases-0.2.08-ictce-5.3.0.eb
index 6954627e469812ecc641eb7ab12abdd5ec1b851e..c408bf08bd6844364be244d7304ceb7704e61978 100644
--- a/easybuild/easyconfigs/o/Oases/Oases-0.2.08-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/o/Oases/Oases-0.2.08-ictce-5.3.0.eb
@@ -33,9 +33,9 @@ source_urls = [
 # listed make targets exclude 'doc' on purpose
 buildopts = ['VELVET_DIR=../velvet_%s cleanobj velvet oases' % velvetver]
 
-files_to_copy = [(["oases"],'bin'), "data", "scripts", "src", "doc", "LICENSE.txt", "README.txt"]
+files_to_copy = [(["oases"], 'bin'), "data", "scripts", "src", "doc", "LICENSE.txt", "README.txt"]
 
-sanity_check_paths={
+sanity_check_paths = {
     'files': ["bin/oases", "LICENSE.txt", "README.txt"],
     'dirs': ["data", "scripts", "src", "doc"]
 }
diff --git a/easybuild/easyconfigs/o/Oases/Oases-0.2.08-intel-2015a.eb b/easybuild/easyconfigs/o/Oases/Oases-0.2.08-intel-2015a.eb
index 9c657fda4a8d08e46f554b1283952fcbd0f96145..ed69d393e309d9aaedf30c6b04683fb8df2a1e77 100644
--- a/easybuild/easyconfigs/o/Oases/Oases-0.2.08-intel-2015a.eb
+++ b/easybuild/easyconfigs/o/Oases/Oases-0.2.08-intel-2015a.eb
@@ -36,7 +36,7 @@ parallel = 1
 
 files_to_copy = [(["oases"], 'bin'), "data", "scripts", "src", "doc", "LICENSE.txt", "README.txt"]
 
-sanity_check_paths={
+sanity_check_paths = {
     'files': ["bin/oases", "LICENSE.txt", "README.txt"],
     'dirs': ["data", "scripts", "src", "doc"]
 }
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 15b1424e0dd07df8c121c0f5fa44c55d6b6c9869..26ed184aedbdf57d354467e3f871c90d78cee4fb 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
@@ -2,6 +2,7 @@ easyblock = "PythonPackage"
 
 name = 'Oger'
 version = '1.1.3'
+versionsuffix = '-Python-%(pyver)s'
 
 homepage = 'http://reservoir-computing.org/organic/engine'
 description = """The OrGanic Environment for Reservoir computing (Oger) toolbox is a Python toolbox, released under the
@@ -13,27 +14,18 @@ toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
 source_urls = ['http://organic.elis.ugent.be/sites/organic.elis.ugent.be/files']
 sources = [SOURCE_TAR_GZ]
 
-python = "Python"
-pythonversion = '2.7.3'
-pythonshortversion = ".".join(pythonversion.split(".")[:-1])
-
-versionsuffix = "-%s-%s" % (python, pythonversion)
-
 dependencies = [
-                (python, pythonversion),
-                ("MDP", "3.3", versionsuffix),
-               ]
+    ('Python', '2.7.3'),
+    ('MDP', '3.3', versionsuffix),
+]
 
 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
-                                    [
-                                        'datasets', 'evaluation', 'examples', 'gradient',
-                                        'nodes', 'parallel', 'tests', 'utils',
-                                    ]
-                            ]
-                   }
+    'files': ['lib/python%(pyshortver)s/site-packages/Oger/__init__.py'],
+    'dirs': ['lib/python%%(pyshortver)s/site-packages/Oger/%s' % d for d in ['datasets', 'evaluation', 'examples',
+                                                                             'gradient', 'nodes', 'parallel',
+                                                                             'tests', 'utils']],
+}
 
 moduleclass = 'data'
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 95e21e11e76440df7b9109467ad0e299d67e65b2..ccf55821515cb2a195fb57841aff8b465451c84d 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
@@ -2,6 +2,7 @@ easyblock = "PythonPackage"
 
 name = 'Oger'
 version = '1.1.3'
+versionsuffix = '-Python-%(pyver)s'
 
 homepage = 'http://reservoir-computing.org/organic/engine'
 description = """The OrGanic Environment for Reservoir computing (Oger) toolbox is a Python toolbox, released under the
@@ -14,27 +15,18 @@ toolchain = {'name': 'goolf', 'version': '1.4.10'}
 source_urls = ['http://organic.elis.ugent.be/sites/organic.elis.ugent.be/files']
 sources = [SOURCE_TAR_GZ]
 
-python = "Python"
-pythonversion = '2.7.3'
-pythonshortversion = ".".join(pythonversion.split(".")[:-1])
-
-versionsuffix = "-%s-%s" % (python, pythonversion)
-
 dependencies = [
-                (python, pythonversion),
-                ("MDP", "3.3", versionsuffix),
-               ]
+    ('Python', '2.7.3'),
+    ('MDP', '3.3', versionsuffix),
+]
 
 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
-                                    [
-                                        'datasets', 'evaluation', 'examples', 'gradient',
-                                        'nodes', 'parallel', 'tests', 'utils',
-                                    ]
-                            ]
-                   }
+    'files': ['lib/python%(pyshortver)s/site-packages/Oger/__init__.py'],
+    'dirs': ['lib/python%%(pyshortver)s/site-packages/Oger/%s' % d for d in ['datasets', 'evaluation', 'examples',
+                                                                             'gradient', 'nodes', 'parallel',
+                                                                             'tests', 'utils']],
+}
 
 moduleclass = 'data'
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 e5cd3a5503985c67176807d5e764c2bc73bf887e..0a7a7d631bafe9582d11ecd9732a373b85065b20 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
@@ -2,6 +2,7 @@ easyblock = "PythonPackage"
 
 name = 'Oger'
 version = '1.1.3'
+versionsuffix = '-Python-%(pyver)s'
 
 homepage = 'http://reservoir-computing.org/organic/engine'
 description = """The OrGanic Environment for Reservoir computing (Oger) toolbox is a Python toolbox, released under the
@@ -13,24 +14,18 @@ toolchain = {'name': 'ictce', 'version': '4.0.6'}
 source_urls = ['http://organic.elis.ugent.be/sites/organic.elis.ugent.be/files']
 sources = [SOURCE_TAR_GZ]
 
-python = "Python"
-pythonversion = '2.7.3'
-pythonshortversion = ".".join(pythonversion.split(".")[:-1])
-
-versionsuffix = "-%s-%s" % (python, pythonversion)
-
 dependencies = [
-                (python, pythonversion),
-                ("MDP", "3.3", versionsuffix),
-               ]
+    ('Python', '2.7.3'),
+    ('MDP', '3.3', versionsuffix),
+]
 
 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
-                                ['datasets', 'evaluation', 'examples', 'gradient', 'nodes', 'parallel', 'tests', 'utils']
-                              ]
-                     }
+    'files': ['lib/python%(pyshortver)s/site-packages/Oger/__init__.py'],
+    'dirs': ['lib/python%%(pyshortver)s/site-packages/Oger/%s' % d for d in ['datasets', 'evaluation', 'examples',
+                                                                             'gradient', 'nodes', 'parallel',
+                                                                             'tests', 'utils']],
+}
 
 moduleclass = 'data'
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 a04089fb7dad4669d129c18ba0efb2b33f672cbe..f44806a8e59e9ab4848314ecddb5d9a038d7de47 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
@@ -2,6 +2,7 @@ easyblock = "PythonPackage"
 
 name = 'Oger'
 version = '1.1.3'
+versionsuffix = '-Python-%(pyver)s'
 
 homepage = 'http://reservoir-computing.org/organic/engine'
 description = """The OrGanic Environment for Reservoir computing (Oger) toolbox is a Python toolbox, released under the
@@ -14,24 +15,18 @@ toolchain = {'name': 'ictce', 'version': '5.3.0'}
 source_urls = ['http://organic.elis.ugent.be/sites/organic.elis.ugent.be/files']
 sources = [SOURCE_TAR_GZ]
 
-python = "Python"
-pythonversion = '2.7.3'
-pythonshortversion = ".".join(pythonversion.split(".")[:-1])
-
-versionsuffix = "-%s-%s" % (python, pythonversion)
-
 dependencies = [
-                (python, pythonversion),
-                ("MDP", "3.3", versionsuffix),
-               ]
+    ('Python', '2.7.3'),
+    ('MDP', '3.3', versionsuffix),
+]
 
 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
-                                ['datasets', 'evaluation', 'examples', 'gradient', 'nodes', 'parallel', 'tests', 'utils']
-                              ]
-                     }
+    'files': ['lib/python%(pyshortver)s/site-packages/Oger/__init__.py'],
+    'dirs': ['lib/python%%(pyshortver)s/site-packages/Oger/%s' % d for d in ['datasets', 'evaluation', 'examples',
+                                                                             'gradient', 'nodes', 'parallel',
+                                                                             'tests', 'utils']],
+}
 
 moduleclass = 'data'
diff --git a/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.12-GCC-4.9.2-LAPACK-3.5.0.eb b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.12-GCC-4.9.2-LAPACK-3.5.0.eb
index 97ff1d323e330e13a221afd5cb6faa5007dbf5ec..3a54e8b3b2337f18c41d89a43c114b84cb34b61e 100644
--- a/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.12-GCC-4.9.2-LAPACK-3.5.0.eb
+++ b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.12-GCC-4.9.2-LAPACK-3.5.0.eb
@@ -49,4 +49,3 @@ sanity_check_paths = {
 }
 
 moduleclass = 'numlib'
-
diff --git a/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.13-GCC-4.8.4-LAPACK-3.5.0.eb b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.13-GCC-4.8.4-LAPACK-3.5.0.eb
index c678bbcc6e2e4d2e735d898dd9315f6ad50ae4e5..870b4ca0ecff56fcc0980892294d42c666c30a98 100644
--- a/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.13-GCC-4.8.4-LAPACK-3.5.0.eb
+++ b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.13-GCC-4.8.4-LAPACK-3.5.0.eb
@@ -49,4 +49,3 @@ sanity_check_paths = {
 }
 
 moduleclass = 'numlib'
-
diff --git a/easybuild/easyconfigs/o/OpenCV/OpenCV-2.4.9-intel-2014.06.eb b/easybuild/easyconfigs/o/OpenCV/OpenCV-2.4.9-intel-2014.06.eb
index cda5e655b4d5d8586ebb56405ed05d2fc5ff2bc3..96d8323ca5ed2d0b90509f0767d302cf316448bf 100644
--- a/easybuild/easyconfigs/o/OpenCV/OpenCV-2.4.9-intel-2014.06.eb
+++ b/easybuild/easyconfigs/o/OpenCV/OpenCV-2.4.9-intel-2014.06.eb
@@ -32,13 +32,13 @@ javaver = '1.7.0_79'
 dependencies = [
     (python, pythonver),
     ('zlib', '1.2.8'),
-    ('ffmpeg', '2.4'),
+    ('FFmpeg', '2.4'),
     ('libjpeg-turbo', '1.3.1'),
     ('libpng', '1.6.12'),
     ('LibTIFF', '4.0.3'),
     ('JasPer', '1.900.1'),
-    (java, javaver ,'', True),
-    ('ant', '1.9.3', '-%s-%s' % (java,javaver), True),
+    (java, javaver, '', True),
+    ('ant', '1.9.3', '-%s-%s' % (java, javaver), True),
     ('GLib', '2.40.0')
 ]
 
@@ -64,7 +64,7 @@ configopts += '-DWITH_CUDA=OFF '
 
 sanity_check_paths = {
     'files': ['lib/libopencv_core.%s' % SHLIB_EXT] +
-             [ 'bin/opencv_%s' % x for x in ['haartraining', 'createsamples', 'performance', 'traincascade'] ],
+             ['bin/opencv_%s' % x for x in ['haartraining', 'createsamples', 'performance', 'traincascade']],
     'dirs': ['include']
 }
 
diff --git a/easybuild/easyconfigs/o/OpenCV/OpenCV-2.4.9-intel-2014b.eb b/easybuild/easyconfigs/o/OpenCV/OpenCV-2.4.9-intel-2014b.eb
index 2db6adbc7404daf43f3193a9a2f6beee25afb3d0..776b0d7db5adc50003bf3f23ded55f3ab19967fc 100644
--- a/easybuild/easyconfigs/o/OpenCV/OpenCV-2.4.9-intel-2014b.eb
+++ b/easybuild/easyconfigs/o/OpenCV/OpenCV-2.4.9-intel-2014b.eb
@@ -32,13 +32,13 @@ javaver = '1.7.0_60'
 dependencies = [
     (python, pythonver),
     ('zlib', '1.2.8'),
-    ('ffmpeg', '2.4'),
+    ('FFmpeg', '2.4'),
     ('libjpeg-turbo', '1.3.1'),
     ('libpng', '1.6.12'),
     ('LibTIFF', '4.0.3'),
     ('JasPer', '1.900.1'),
-    (java, javaver ,'', True),
-    ('ant', '1.9.3', '-%s-%s' % (java,javaver), True),
+    (java, javaver, '', True),
+    ('ant', '1.9.3', '-%s-%s' % (java, javaver), True),
     ('GLib', '2.40.0')
 ]
 
@@ -64,7 +64,7 @@ configopts += '-DWITH_CUDA=OFF '
 
 sanity_check_paths = {
     'files': ['lib/libopencv_core.%s' % SHLIB_EXT] +
-             [ 'bin/opencv_%s' % x for x in ['haartraining', 'createsamples', 'performance', 'traincascade'] ],
+             ['bin/opencv_%s' % x for x in ['haartraining', 'createsamples', 'performance', 'traincascade']],
     'dirs': ['include']
 }
 
diff --git a/easybuild/easyconfigs/o/OpenFOAM-Extend/OpenFOAM-Extend-3.0-goolf-1.4.10-20140227.eb b/easybuild/easyconfigs/o/OpenFOAM-Extend/OpenFOAM-Extend-3.0-goolf-1.4.10-20140227.eb
index a8de03c3a1d4330aac6b67d147c35b77909c2333..2a3beb36838bea5093f5765bddd9d11f2eebeb3a 100644
--- a/easybuild/easyconfigs/o/OpenFOAM-Extend/OpenFOAM-Extend-3.0-goolf-1.4.10-20140227.eb
+++ b/easybuild/easyconfigs/o/OpenFOAM-Extend/OpenFOAM-Extend-3.0-goolf-1.4.10-20140227.eb
@@ -38,7 +38,7 @@ builddependencies = [
     ('CMake', '2.8.12'),
 ]
 
-prebuildopts = "(wcleanAll || echo 'all is fine') && "  #  clean up everything first (and ignore any errors)
+prebuildopts = "(wcleanAll || echo 'all is fine') && "  # clean up everything first (and ignore any errors)
 
 # too many builds in parallel actually slows down the build
 maxparallel = 4
diff --git a/easybuild/easyconfigs/o/OpenFOAM-Extend/OpenFOAM-Extend-3.1-gimkl-2.11.5.eb b/easybuild/easyconfigs/o/OpenFOAM-Extend/OpenFOAM-Extend-3.1-gimkl-2.11.5.eb
index 1fe977591c5d2071f15ec9136d58ff1ad6d826ad..06755b2786a76b0027d65549257aac10af028995 100644
--- a/easybuild/easyconfigs/o/OpenFOAM-Extend/OpenFOAM-Extend-3.1-gimkl-2.11.5.eb
+++ b/easybuild/easyconfigs/o/OpenFOAM-Extend/OpenFOAM-Extend-3.1-gimkl-2.11.5.eb
@@ -40,7 +40,7 @@ builddependencies = [
 
 ]
 
-prebuildopts = "(wcleanAll || echo 'all is fine') && "  #  clean up everything first (and ignore any errors)
+prebuildopts = "(wcleanAll || echo 'all is fine') && "  # clean up everything first (and ignore any errors)
 
 # too many builds in parallel actually slows down the build
 maxparallel = 4
diff --git a/easybuild/easyconfigs/o/OpenFOAM-Extend/OpenFOAM-Extend-3.1-goolf-1.4.10.eb b/easybuild/easyconfigs/o/OpenFOAM-Extend/OpenFOAM-Extend-3.1-goolf-1.4.10.eb
index d845c52d8f75e3e34d8e7c3adf49363f5bad707f..bebef71955970ab74bb80ed2f22079ac5800ef4b 100644
--- a/easybuild/easyconfigs/o/OpenFOAM-Extend/OpenFOAM-Extend-3.1-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/o/OpenFOAM-Extend/OpenFOAM-Extend-3.1-goolf-1.4.10.eb
@@ -38,7 +38,7 @@ builddependencies = [
     ('CMake', '2.8.12'),
 ]
 
-prebuildopts = "(wcleanAll || echo 'all is fine') && "  #  clean up everything first (and ignore any errors)
+prebuildopts = "(wcleanAll || echo 'all is fine') && "  # clean up everything first (and ignore any errors)
 
 # too many builds in parallel actually slows down the build
 maxparallel = 4
diff --git a/easybuild/easyconfigs/o/OpenFOAM-Extend/OpenFOAM-Extend-3.2-gimkl-2.11.5.eb b/easybuild/easyconfigs/o/OpenFOAM-Extend/OpenFOAM-Extend-3.2-gimkl-2.11.5.eb
index e1a49bf5a0199f203d91a0f4e58e1212c3e26ffa..4ddd37d882375208e3af112a7c2a74e9f7617ece 100644
--- a/easybuild/easyconfigs/o/OpenFOAM-Extend/OpenFOAM-Extend-3.2-gimkl-2.11.5.eb
+++ b/easybuild/easyconfigs/o/OpenFOAM-Extend/OpenFOAM-Extend-3.2-gimkl-2.11.5.eb
@@ -40,7 +40,7 @@ builddependencies = [
     ('CMake', '3.3.2'),
 ]
 
-prebuildopts = "(wcleanAll || echo 'all is fine') && "  #  clean up everything first (and ignore any errors)
+prebuildopts = "(wcleanAll || echo 'all is fine') && "  # clean up everything first (and ignore any errors)
 
 # too many builds in parallel actually slows down the build
 maxparallel = 4
diff --git a/easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-2.0.1-goolf-1.4.10.eb b/easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-2.0.1-goolf-1.4.10.eb
index 9a63e57ca5cfd814a531ec39aeacff060f6ea4a2..f6e2827584fe72a2222d2cf90b7edbf85639c5e6 100644
--- a/easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-2.0.1-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-2.0.1-goolf-1.4.10.eb
@@ -15,9 +15,10 @@ sources = [
     'ThirdParty-%(version)s.gtgz',
 ]
 
-patches = ['cleanup-OpenFOAM-%s.patch' % version,
-          ('cleanup-ThirdParty-%s.patch' % version, "..")  # patch should not be applied in OpenFOAM subdir
-          ]
+patches = [
+    'cleanup-OpenFOAM-%(version)s.patch',
+    ('cleanup-ThirdParty-%(version)s.patch', ".."),  # patch should not be applied in OpenFOAM subdir
+]
 
 builddependencies = [('flex', '2.5.35')]
 
diff --git a/easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-2.0.1-ictce-6.1.5.eb b/easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-2.0.1-ictce-6.1.5.eb
index 1020e0de704f3af3c2b9f379f41bf2dee2084e72..2836d4ab9decae7963f31b0ed0555161eb663df5 100644
--- a/easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-2.0.1-ictce-6.1.5.eb
+++ b/easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-2.0.1-ictce-6.1.5.eb
@@ -15,9 +15,10 @@ sources = [
     'ThirdParty-%(version)s.gtgz',
 ]
 
-patches = ['cleanup-OpenFOAM-%s.patch' % version,
-          ('cleanup-ThirdParty-%s.patch' % version, "..")  # patch should not be applied in OpenFOAM subdir
-          ]
+patches = [
+    'cleanup-OpenFOAM-%(version)s.patch',
+    ('cleanup-ThirdParty-%(version)s.patch', ".."),  # patch should not be applied in OpenFOAM subdir
+]
 
 builddependencies = [('flex', '2.5.38')]
 
diff --git a/easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-2.1.1-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-2.1.1-goalf-1.1.0-no-OFED.eb
index 47f96c354b3957656ef4a474792b3901f0c550e3..eeefa3f7b2eff54dc748a87a85f7c412334e620a 100644
--- a/easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-2.1.1-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-2.1.1-goalf-1.1.0-no-OFED.eb
@@ -15,9 +15,10 @@ sources = [
     'ThirdParty-%(version)s.tgz',
 ]
 
-patches = ['cleanup-OpenFOAM-%s.patch' % version,
-          ('cleanup-ThirdParty-%s.patch' % version, "..")  # patch should not be applied in OpenFOAM subdir
-          ]
+patches = [
+    'cleanup-OpenFOAM-%(version)s.patch',
+    ('cleanup-ThirdParty-%(version)s.patch', ".."),  # patch should not be applied in OpenFOAM subdir
+]
 
 builddependencies = [('flex', '2.5.35')]
 
diff --git a/easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-2.1.1-goolf-1.4.10.eb b/easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-2.1.1-goolf-1.4.10.eb
index f8941ca15c5c5805ec33d4655681c327ca7ce716..686251e8fe7f53c2e34ed15fa34800ca84d87d77 100644
--- a/easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-2.1.1-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-2.1.1-goolf-1.4.10.eb
@@ -15,9 +15,10 @@ sources = [
     'ThirdParty-%(version)s.tgz',
 ]
 
-patches = ['cleanup-OpenFOAM-%s.patch' % version,
-          ('cleanup-ThirdParty-%s.patch' % version, "..")  # patch should not be applied in OpenFOAM subdir
-          ]
+patches = [
+    'cleanup-OpenFOAM-%(version)s.patch',
+    ('cleanup-ThirdParty-%(version)s.patch', ".."),  # patch should not be applied in OpenFOAM subdir
+]
 
 builddependencies = [('flex', '2.5.35')]
 
diff --git a/easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-2.1.1-ictce-4.0.6.eb b/easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-2.1.1-ictce-4.0.6.eb
index 9a382ba0a0f33bf40e4edebfc3a4a8cd02bb80fe..1a0fdd75190c716351d8ea3e0589a0fe9225983a 100644
--- a/easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-2.1.1-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-2.1.1-ictce-4.0.6.eb
@@ -15,9 +15,10 @@ sources = [
     'ThirdParty-%(version)s.tgz',
 ]
 
-patches = ['cleanup-OpenFOAM-%s.patch' % version,
-          ('cleanup-ThirdParty-%s.patch' % version, "..")  # patch should not be applied in OpenFOAM subdir
-          ]
+patches = [
+    'cleanup-OpenFOAM-%(version)s.patch',
+    ('cleanup-ThirdParty-%(version)s.patch', ".."),  # patch should not be applied in OpenFOAM subdir
+]
 
 builddependencies = [('flex', '2.5.35')]
 
diff --git a/easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-2.1.1-ictce-5.3.0.eb b/easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-2.1.1-ictce-5.3.0.eb
index 3f4d83aadebc580b435c635fe5897a3a76107f4a..823efd74ab2aace05329b9e109fb4557a95c3392 100644
--- a/easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-2.1.1-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-2.1.1-ictce-5.3.0.eb
@@ -15,9 +15,10 @@ sources = [
     'ThirdParty-%(version)s.tgz',
 ]
 
-patches = ['cleanup-OpenFOAM-%s.patch' % version,
-          ('cleanup-ThirdParty-%s.patch' % version, "..")  # patch should not be applied in OpenFOAM subdir
-          ]
+patches = [
+    'cleanup-OpenFOAM-%(version)s.patch',
+    ('cleanup-ThirdParty-%(version)s.patch', ".."),  # patch should not be applied in OpenFOAM subdir
+]
 
 builddependencies = [('flex', '2.5.35')]
 
diff --git a/easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-3.0.0-foss-2016a.eb b/easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-3.0.0-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..7985e4b2671c60eb4b7cad3206bb05011871d543
--- /dev/null
+++ b/easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-3.0.0-foss-2016a.eb
@@ -0,0 +1,39 @@
+name = 'OpenFOAM'
+version = '3.0.0'
+
+homepage = 'http://www.openfoam.com/'
+description = """OpenFOAM is a free, open source CFD software package. 
+ OpenFOAM has an extensive range of features to solve anything from complex fluid flows
+ involving chemical reactions, turbulence and heat transfer, 
+ to solid dynamics and electromagnetics."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = ['http://downloads.sourceforge.net/foam/%(version)s']
+sources = [
+    SOURCE_TGZ,
+    'ThirdParty-%(version)s.tgz',
+]
+
+patches = [
+    'OpenFOAM-%(version)s_cleanup.patch',
+    'OpenFOAM-%(version)s_libreadline.patch',
+    ('ThirdParty-%(version)s_cleanup.patch', ".."),  # patch should not be applied in OpenFOAM subdir
+]
+
+dependencies = [    
+    ('libreadline', '6.3'),
+    # OpenFOAM requires 64 bit METIS using 32 bit indexes (array indexes)
+    ('METIS', '5.1.0', '-32bitIDX'),
+    ('ncurses', '6.0'),
+    ('SCOTCH', '6.0.4'),
+    ('Boost', '1.60.0'),
+]
+
+builddependencies = [
+    ('Bison', '3.0.4'),
+    ('CMake', '3.4.3'),
+    ('flex', '2.5.39'),
+]
+
+moduleclass = 'cae'
diff --git a/easybuild/easyconfigs/o/OpenMD/OpenMD-2.2-ictce-7.1.2.eb b/easybuild/easyconfigs/o/OpenMD/OpenMD-2.2-ictce-7.1.2.eb
index 2a9e21b8aa37f5f7b062b8184e03a772dbc22bbf..9d61c22c0958490376b89253aadc8cdda0a179f5 100644
--- a/easybuild/easyconfigs/o/OpenMD/OpenMD-2.2-ictce-7.1.2.eb
+++ b/easybuild/easyconfigs/o/OpenMD/OpenMD-2.2-ictce-7.1.2.eb
@@ -15,7 +15,7 @@ toolchainopts = {'usempi': True, 'optarch': True}
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = ['http://openmd.org/releases']
 
-builddependencies = [('CMake' , '2.8.12')]
+builddependencies = [('CMake', '2.8.12')]
 
 dependencies = [
     ('Python', '2.7.8'),
diff --git a/easybuild/easyconfigs/o/OpenMD/OpenMD-2.2-intel-2014b.eb b/easybuild/easyconfigs/o/OpenMD/OpenMD-2.2-intel-2014b.eb
index 0ae135dd9d085bb24388eaf519c2837662de573c..1e5a20c6c0d892373a4a2f234e37e981eb058df1 100644
--- a/easybuild/easyconfigs/o/OpenMD/OpenMD-2.2-intel-2014b.eb
+++ b/easybuild/easyconfigs/o/OpenMD/OpenMD-2.2-intel-2014b.eb
@@ -15,7 +15,7 @@ toolchainopts = {'usempi': True, 'optarch': True}
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = ['http://openmd.org/releases']
 
-builddependencies = [('CMake' , '2.8.12')]
+builddependencies = [('CMake', '2.8.12')]
 
 dependencies = [
     ('Python', '2.7.8'),
diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.3-iccifort-2011.13.367.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.3-iccifort-2011.13.367.eb
index d88a606fa0874e2b4b4eddd005397d49a5617cf0..8e4b15732daa19b818a4708cf2968c502b5aec67 100644
--- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.3-iccifort-2011.13.367.eb
+++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.3-iccifort-2011.13.367.eb
@@ -30,4 +30,10 @@ sanity_check_paths = {
     'dirs': ["include/openmpi/ompi/mpi/cxx"],
 }
 
+sanity_check_commands = [
+    ('mpicc --version | grep icc', ''),
+    ('mpicxx --version | grep icpc', ''),
+    ('mpif90 --version | grep ifort', ''),
+]
+
 moduleclass = 'mpi'
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 b1763322934c1f48c2488707290dc4e09bc32de0..417cf55b81c7c839d0a55cebac4454e44f2e93c2 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
@@ -13,7 +13,7 @@ sources = [SOURCELOWER_TAR_GZ]
 source_urls = ['http://www.open-mpi.org/software/ompi/v%(version_major_minor)s/downloads']
 
 patches = [
-      'OpenMPI-1.6.5-vt_cupti_events.patch',
+    'OpenMPI-1.6.5-vt_cupti_events.patch',
 ]
 
 configopts = '--with-threads=posix --enable-shared --enable-mpi-thread-multiple --without-openib '
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 da09b2dec4cd73cd870aa1bf8c39778e59474345..9701c637edafd609de2670580faa30467b872785 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
@@ -13,7 +13,7 @@ sources = [SOURCELOWER_TAR_GZ]
 source_urls = ['http://www.open-mpi.org/software/ompi/v%(version_major_minor)s/downloads']
 
 patches = [
-      'OpenMPI-1.6.5-vt_cupti_events.patch',
+    'OpenMPI-1.6.5-vt_cupti_events.patch',
 ]
 
 configopts = '--with-threads=posix --enable-shared --enable-mpi-thread-multiple --without-openib '
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 192e2876579a4bdd2afef0a2deb6e88649857551..231057cda1a4f63df0b4b0a525ccc9ca30dff92b 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
@@ -12,7 +12,7 @@ sources = [SOURCELOWER_TAR_GZ]
 source_urls = ['http://www.open-mpi.org/software/ompi/v%(version_major_minor)s/downloads']
 
 patches = [
-      'OpenMPI-1.6.5-vt_cupti_events.patch',
+    'OpenMPI-1.6.5-vt_cupti_events.patch',
 ]
 
 configopts = '--with-threads=posix --enable-shared --enable-mpi-thread-multiple --with-openib '
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 6714cfb974eff9395031a7d736fe3f95bb28fb0b..9c4d7ed9f6a7b5b586ebf59f8aa954fbe0bb0f84 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
@@ -13,7 +13,7 @@ sources = [SOURCELOWER_TAR_GZ]
 source_urls = ['http://www.open-mpi.org/software/ompi/v%(version_major_minor)s/downloads']
 
 patches = [
-      'OpenMPI-1.6.5-vt_cupti_events.patch',
+    'OpenMPI-1.6.5-vt_cupti_events.patch',
 ]
 
 configopts = '--with-threads=posix --enable-shared --enable-mpi-thread-multiple --without-openib '
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 dcc884ec5473fda9e3ba293a5ecd92c15d264d3b..8b4682c1dba5eee26c43fac300fee5758d24891d 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
@@ -12,7 +12,7 @@ sources = [SOURCELOWER_TAR_GZ]
 source_urls = ['http://www.open-mpi.org/software/ompi/v%(version_major_minor)s/downloads']
 
 patches = [
-      'OpenMPI-1.6.5-vt_cupti_events.patch',
+    'OpenMPI-1.6.5-vt_cupti_events.patch',
 ]
 
 configopts = '--with-threads=posix --enable-shared --enable-mpi-thread-multiple --with-openib '
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 ef8df74e3029a7c45ec30ac05ee932922abafecf..90ce3018dedbbf2c3d963b2da7ec4f4550b183c1 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
@@ -12,7 +12,7 @@ sources = [SOURCELOWER_TAR_GZ]
 source_urls = ['http://www.open-mpi.org/software/ompi/v%(version_major_minor)s/downloads']
 
 patches = [
-      'OpenMPI-1.6.5-vt_cupti_events.patch',
+    'OpenMPI-1.6.5-vt_cupti_events.patch',
 ]
 
 configopts = '--with-threads=posix --enable-shared --enable-mpi-thread-multiple --with-openib '
@@ -23,7 +23,7 @@ configopts += '--with-hwloc=$EBROOTHWLOC '
 dependencies = [('hwloc', '1.8.1')]
 
 # needed for --with-openib
-osdependencies = [('libibverbs-dev','libibverbs-devel')]
+osdependencies = [('libibverbs-dev', 'libibverbs-devel')]
 
 libs = ["mpi_cxx", "mpi_f77", "mpi_f90", "mpi", "ompitrace", "open-pal", "open-rte",
         "vt", "vt-hyb", "vt-mpi", "vt-mpi-unify"]
diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-iccifort-2013_sp1.2.144.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-iccifort-2013_sp1.2.144.eb
index 4fc8978e4dd5bda028cdc3019bcd9366074d5edf..069c5ad3b937db38c399d1cf3b114ebc7abc957c 100644
--- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-iccifort-2013_sp1.2.144.eb
+++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-iccifort-2013_sp1.2.144.eb
@@ -30,4 +30,10 @@ sanity_check_paths = {
     'dirs': ["include/openmpi/ompi/mpi/cxx"],
 }
 
+sanity_check_commands = [
+    ('mpicc --version | grep icc', ''),
+    ('mpicxx --version | grep icpc', ''),
+    ('mpif90 --version | grep ifort', ''),
+]
+
 moduleclass = 'mpi'
diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-iccifort-2013_sp1.4.211-no-OFED.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-iccifort-2013_sp1.4.211-no-OFED.eb
index 0bb4349893a40dbd2b9e1ac16432eeb08305d867..702e7940ba301df5c8081963140d14ffe4c72e97 100644
--- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-iccifort-2013_sp1.4.211-no-OFED.eb
+++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-iccifort-2013_sp1.4.211-no-OFED.eb
@@ -28,4 +28,10 @@ sanity_check_paths = {
     'dirs': ["include/openmpi/ompi/mpi/cxx"],
 }
 
+sanity_check_commands = [
+    ('mpicc --version | grep icc', ''),
+    ('mpicxx --version | grep icpc', ''),
+    ('mpif90 --version | grep ifort', ''),
+]
+
 moduleclass = 'mpi'
diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-iccifort-2013_sp1.4.211.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-iccifort-2013_sp1.4.211.eb
index e9f2f244ec124a54d581a97c0e27e3266c7903bb..7ee3a0b73712ed3a86c56d8d5c3c53bd51e9c4a5 100644
--- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-iccifort-2013_sp1.4.211.eb
+++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.6.5-iccifort-2013_sp1.4.211.eb
@@ -18,7 +18,7 @@ configopts += '--with-hwloc=$EBROOTHWLOC '  # hwloc support
 dependencies = [('hwloc', '1.9')]
 
 # needed for --with-openib
-osdependencies = [('libibverbs-dev','libibverbs-devel')]
+osdependencies = [('libibverbs-dev', 'libibverbs-devel')]
 
 libs = ["mpi_cxx", "mpi_f77", "mpi_f90", "mpi", "ompitrace", "open-pal", "open-rte",
         "vt", "vt-hyb", "vt-mpi", "vt-mpi-unify"]
@@ -30,4 +30,10 @@ sanity_check_paths = {
     'dirs': ["include/openmpi/ompi/mpi/cxx"],
 }
 
+sanity_check_commands = [
+    ('mpicc --version | grep icc', ''),
+    ('mpicxx --version | grep icpc', ''),
+    ('mpif90 --version | grep ifort', ''),
+]
+
 moduleclass = 'mpi'
diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.8.3-iccifort-2013_sp1.4.211-no-OFED.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.8.3-iccifort-2013_sp1.4.211-no-OFED.eb
index c6c6f0c9abedef3c520b51107fecf6f6e967bff9..c0e27137e3b2fbf6b849096f35dcdca1633989bd 100644
--- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.8.3-iccifort-2013_sp1.4.211-no-OFED.eb
+++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.8.3-iccifort-2013_sp1.4.211-no-OFED.eb
@@ -28,5 +28,10 @@ sanity_check_paths = {
     'dirs': ["include/openmpi/ompi/mpi/cxx"],
 }
 
-moduleclass = 'mpi'
+sanity_check_commands = [
+    ('mpicc --version | grep icc', ''),
+    ('mpicxx --version | grep icpc', ''),
+    ('mpifort --version | grep ifort', ''),
+]
 
+moduleclass = 'mpi'
diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.8.3-iccifort-2013_sp1.4.211.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.8.3-iccifort-2013_sp1.4.211.eb
index f5e9417cad30712278bc9b5e87c3d59d6da270cb..19949c397cc13964e94fdcad77308e74de4d2a25 100644
--- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.8.3-iccifort-2013_sp1.4.211.eb
+++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.8.3-iccifort-2013_sp1.4.211.eb
@@ -29,4 +29,10 @@ sanity_check_paths = {
     'dirs': ["include/openmpi/ompi/mpi/cxx"],
 }
 
+sanity_check_commands = [
+    ('mpicc --version | grep icc', ''),
+    ('mpicxx --version | grep icpc', ''),
+    ('mpifort --version | grep ifort', ''),
+]
+
 moduleclass = 'mpi'
diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.8.4-iccifort-2015.1.133-GCC-4.9.2.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.8.4-iccifort-2015.1.133-GCC-4.9.2.eb
index 780c3c78ba6dfab1b6a0032e5c5567383be30fc6..d39ca71b30c149d765d6b471ac5916051ee4da8f 100644
--- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.8.4-iccifort-2015.1.133-GCC-4.9.2.eb
+++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.8.4-iccifort-2015.1.133-GCC-4.9.2.eb
@@ -30,4 +30,10 @@ sanity_check_paths = {
     'dirs': ["include/openmpi/ompi/mpi/cxx"],
 }
 
+sanity_check_commands = [
+    ('mpicc --version | grep icc', ''),
+    ('mpicxx --version | grep icpc', ''),
+    ('mpifort --version | grep ifort', ''),
+]
+
 moduleclass = 'mpi'
diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.8.4-iccifort-2015.2.164-GCC-4.9.2.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.8.4-iccifort-2015.2.164-GCC-4.9.2.eb
index ca0afea9dc034c006d7c3a8637f513f221a4b69a..86eed73b49ff3fe70463b5c517a6e6e9250ecdbd 100644
--- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.8.4-iccifort-2015.2.164-GCC-4.9.2.eb
+++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.8.4-iccifort-2015.2.164-GCC-4.9.2.eb
@@ -15,7 +15,6 @@ source_urls = ['http://www.open-mpi.org/software/ompi/v%(version_major_minor)s/d
 configopts = '--with-threads=posix --enable-shared --enable-mpi-thread-multiple --with-verbs '
 configopts += '--enable-mpirun-prefix-by-default '  # suppress failure modes in relation to mpirun path
 configopts += '--with-hwloc=$EBROOTHWLOC '  # hwloc support
-configopts += ' CC=icc FC=ifort CXX=icpc '
 configopts += '--disable-dlopen '  # statically link component, don't do dynamic loading
 
 dependencies = [('hwloc', '1.10.0')]
@@ -31,4 +30,10 @@ sanity_check_paths = {
     'dirs': ["include/openmpi/ompi/mpi/cxx"],
 }
 
+sanity_check_commands = [
+    ('mpicc --version | grep icc', ''),
+    ('mpicxx --version | grep icpc', ''),
+    ('mpifort --version | grep ifort', ''),
+]
+
 moduleclass = 'mpi'
diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.8.8-iccifort-2015.3.187-GNU-4.9.3-2.25.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.8.8-iccifort-2015.3.187-GNU-4.9.3-2.25.eb
index 10e25e882aa8887986ec0906feec194a1cf94d32..34da0e5297f318e92c7a70b18c5b5af7293fe77e 100644
--- a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.8.8-iccifort-2015.3.187-GNU-4.9.3-2.25.eb
+++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.8.8-iccifort-2015.3.187-GNU-4.9.3-2.25.eb
@@ -15,7 +15,6 @@ source_urls = ['http://www.open-mpi.org/software/ompi/v%(version_major_minor)s/d
 configopts = '--with-threads=posix --enable-shared --enable-mpi-thread-multiple --with-verbs '
 configopts += '--enable-mpirun-prefix-by-default '  # suppress failure modes in relation to mpirun path
 configopts += '--with-hwloc=$EBROOTHWLOC '  # hwloc support
-configopts += ' CC=icc FC=ifort CXX=icpc '
 configopts += '--disable-dlopen '  # statically link component, don't do dynamic loading
 
 dependencies = [('hwloc', '1.11.1')]
@@ -31,4 +30,10 @@ sanity_check_paths = {
     'dirs': ["include/openmpi/ompi/mpi/cxx"],
 }
 
+sanity_check_commands = [
+    ('mpicc --version | grep icc', ''),
+    ('mpicxx --version | grep icpc', ''),
+    ('mpifort --version | grep ifort', ''),
+]
+
 moduleclass = 'mpi'
diff --git a/easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.1r-foss-2015b.eb b/easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.1r-foss-2015b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..9c3838a1b7b893bb545c55584ed951070187f7a7
--- /dev/null
+++ b/easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.1r-foss-2015b.eb
@@ -0,0 +1,19 @@
+name = 'OpenSSL'
+version = '1.0.1r'
+
+homepage = 'http://www.openssl.org/'
+description = """The OpenSSL Project is a collaborative effort to develop a robust, commercial-grade, full-featured,
+ and Open Source toolchain implementing the Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1) 
+ protocols as well as a full-strength general purpose cryptography library. """
+
+toolchain = {'name': 'foss', 'version': '2015b'}
+toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://www.openssl.org/source/']
+
+dependencies = [('zlib', '1.2.8')]
+
+runtest = 'test'
+
+moduleclass = 'system'
diff --git a/easybuild/easyconfigs/p/PCMSolver/PCMSolver-20160205-intel-2016a-Python-2.7.11.eb b/easybuild/easyconfigs/p/PCMSolver/PCMSolver-20160205-intel-2016a-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..861cd9d963571922fc4b6fd91cac92c71198d1d4
--- /dev/null
+++ b/easybuild/easyconfigs/p/PCMSolver/PCMSolver-20160205-intel-2016a-Python-2.7.11.eb
@@ -0,0 +1,43 @@
+easyblock = 'CMakeMake'
+
+name = 'PCMSolver'
+version = '20160205'
+
+homepage = 'https://pcmsolver.readthedocs.org'
+description = """An API for the Polarizable Continuum Model."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+toolchainopts = {'cstd': 'c99'}
+
+sources = ['2473699d6c5db36525160e.tar.gz']
+source_urls = ['https://github.com/PCMSolver/pcmsolver/archive/']
+
+python = 'Python'
+pyver = '2.7.11'
+versionsuffix = '-%s-%s' % (python, pyver)
+
+dependencies = [
+    (python, pyver),
+    ('zlib', '1.2.8'),
+    ('Boost', '1.59.0', versionsuffix),
+]
+
+builddependencies = [
+    ('CMake', '3.4.3'),
+    ('Eigen', '3.2.7'),
+]
+
+configopts = '-DCMAKE_BUILD_TYPE=Release -DEIGEN3_ROOT=$EBROOTEIGEN -DCMAKE_CXX_FLAGS="$LIBLAPACK_MT -DEIGEN_USE_MKL_ALL"'
+
+separate_build_dir = True
+
+runtest = 'test'
+
+postinstallcmds = ["chmod +x %(installdir)s/bin/pcmsolver.py"]
+
+sanity_check_paths = {
+    'files': ['bin/pcmsolver.py', 'lib/libpcm.a', 'lib/libpcm.%s' % SHLIB_EXT],
+    'dirs': ['include']
+}
+
+moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/p/PCRE/PCRE-8.12-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/p/PCRE/PCRE-8.12-goalf-1.1.0-no-OFED.eb
index 4a9ef5925f14b7d11c1ca601fddf4ecf13978508..497a1cd0363abd7fc9566aa24985835a6f37eac5 100644
--- a/easybuild/easyconfigs/p/PCRE/PCRE-8.12-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/p/PCRE/PCRE-8.12-goalf-1.1.0-no-OFED.eb
@@ -13,6 +13,6 @@ toolchainopts = {'optarch': True, 'pic': True}
 source_urls = ['http://prdownloads.sourceforge.net/pcre']
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = "--with-pic --disable-cpp"
+configopts = "--with-pic --disable-cpp --enable-utf --enable-unicode-properties"
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/p/PCRE/PCRE-8.12-goolf-1.4.10.eb b/easybuild/easyconfigs/p/PCRE/PCRE-8.12-goolf-1.4.10.eb
index 5916d698fc1f9082c2cca5747400d90876155684..a1e4190b5984f4e29988209df2ae1aa43d9788aa 100644
--- a/easybuild/easyconfigs/p/PCRE/PCRE-8.12-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/p/PCRE/PCRE-8.12-goolf-1.4.10.eb
@@ -13,6 +13,6 @@ toolchainopts = {'optarch': True, 'pic': True}
 source_urls = ['http://prdownloads.sourceforge.net/pcre']
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = "--with-pic --disable-cpp"
+configopts = "--with-pic --disable-cpp --enable-utf --enable-unicode-properties"
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/p/PCRE/PCRE-8.12-ictce-4.0.6.eb b/easybuild/easyconfigs/p/PCRE/PCRE-8.12-ictce-4.0.6.eb
index e5f29eb85e583a56a26614919094ca460d342bf8..c2c366d78ab2a8f2a308e156b8b9c795c09a14d3 100644
--- a/easybuild/easyconfigs/p/PCRE/PCRE-8.12-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/p/PCRE/PCRE-8.12-ictce-4.0.6.eb
@@ -13,6 +13,6 @@ toolchainopts = {'optarch': True, 'pic': True}
 source_urls = ['http://prdownloads.sourceforge.net/pcre']
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = "--with-pic --disable-cpp"
+configopts = "--with-pic --disable-cpp --enable-utf --enable-unicode-properties"
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/p/PCRE/PCRE-8.12-ictce-5.3.0.eb b/easybuild/easyconfigs/p/PCRE/PCRE-8.12-ictce-5.3.0.eb
index 871d373c07e239c49385a39dba53307b5c9a054b..97cfc3e3dd0b0c2895229a47c81c5299570d045b 100644
--- a/easybuild/easyconfigs/p/PCRE/PCRE-8.12-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/p/PCRE/PCRE-8.12-ictce-5.3.0.eb
@@ -13,6 +13,6 @@ toolchainopts = {'optarch': True, 'pic': True}
 source_urls = ['http://prdownloads.sourceforge.net/pcre']
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = "--with-pic --disable-cpp"
+configopts = "--with-pic --disable-cpp --enable-utf --enable-unicode-properties"
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/p/PCRE/PCRE-8.12-ictce-5.5.0.eb b/easybuild/easyconfigs/p/PCRE/PCRE-8.12-ictce-5.5.0.eb
index 365ae1e42a966e5feb64cf2d21924e35ca6043e1..c8297a55fa6ea2af525f33a37aef7d1c7086d8c6 100644
--- a/easybuild/easyconfigs/p/PCRE/PCRE-8.12-ictce-5.5.0.eb
+++ b/easybuild/easyconfigs/p/PCRE/PCRE-8.12-ictce-5.5.0.eb
@@ -13,6 +13,6 @@ toolchainopts = {'optarch': True, 'pic': True}
 source_urls = ['http://prdownloads.sourceforge.net/pcre']
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = "--with-pic --disable-cpp"
+configopts = "--with-pic --disable-cpp --enable-utf --enable-unicode-properties"
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/p/PCRE/PCRE-8.35-intel-2014b.eb b/easybuild/easyconfigs/p/PCRE/PCRE-8.35-intel-2014b.eb
index a4df16eaada18086aca6026c399b45256e24c3a2..4db7f55f630fe0b63bee447740a21f0ff7705add 100644
--- a/easybuild/easyconfigs/p/PCRE/PCRE-8.35-intel-2014b.eb
+++ b/easybuild/easyconfigs/p/PCRE/PCRE-8.35-intel-2014b.eb
@@ -13,6 +13,6 @@ toolchainopts = {'optarch': True, 'pic': True}
 source_urls = [SOURCEFORGE_SOURCE]
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = "--with-pic --disable-cpp"
+configopts = "--with-pic --disable-cpp --enable-utf --enable-unicode-properties"
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/p/PCRE/PCRE-8.36-foss-2015a.eb b/easybuild/easyconfigs/p/PCRE/PCRE-8.36-foss-2015a.eb
index 7881c04da420044f2a9277d589e959b39d66b53b..bb1b441bcde35ee97c274a67f2c4ec027c353cc9 100644
--- a/easybuild/easyconfigs/p/PCRE/PCRE-8.36-foss-2015a.eb
+++ b/easybuild/easyconfigs/p/PCRE/PCRE-8.36-foss-2015a.eb
@@ -13,6 +13,6 @@ toolchainopts = {'optarch': True, 'pic': True}
 source_urls = [SOURCEFORGE_SOURCE]
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = "--with-pic --disable-cpp"
+configopts = "--with-pic --disable-cpp --enable-utf --enable-unicode-properties"
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/p/PCRE/PCRE-8.36-intel-2015a.eb b/easybuild/easyconfigs/p/PCRE/PCRE-8.36-intel-2015a.eb
index f2529df084483600e9dc344a55d96031cd95b5c5..968b4462f3b822ce5c37e21e105bd2033c13861e 100644
--- a/easybuild/easyconfigs/p/PCRE/PCRE-8.36-intel-2015a.eb
+++ b/easybuild/easyconfigs/p/PCRE/PCRE-8.36-intel-2015a.eb
@@ -13,6 +13,6 @@ toolchainopts = {'optarch': True, 'pic': True}
 source_urls = [SOURCEFORGE_SOURCE]
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = "--with-pic --disable-cpp"
+configopts = "--with-pic --disable-cpp --enable-utf --enable-unicode-properties"
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/p/PCRE/PCRE-8.37-foss-2015a.eb b/easybuild/easyconfigs/p/PCRE/PCRE-8.37-foss-2015a.eb
index 58ef584548b858ef89b576aba21cc754b1fddfae..2142c1c7b59edbfeb55c9a79ab850cb4ac5b9eac 100644
--- a/easybuild/easyconfigs/p/PCRE/PCRE-8.37-foss-2015a.eb
+++ b/easybuild/easyconfigs/p/PCRE/PCRE-8.37-foss-2015a.eb
@@ -13,6 +13,6 @@ toolchainopts = {'optarch': True, 'pic': True}
 source_urls = [SOURCEFORGE_SOURCE]
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = "--with-pic --disable-cpp"
+configopts = "--with-pic --disable-cpp --enable-utf --enable-unicode-properties"
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/p/PCRE/PCRE-8.37-intel-2015a.eb b/easybuild/easyconfigs/p/PCRE/PCRE-8.37-intel-2015a.eb
index 1218fbc5d1c47fda816cc3f31c3d49b8c81930f5..7e31b8922b3b8e936b7bf76fb7e58c3b1a7081cd 100644
--- a/easybuild/easyconfigs/p/PCRE/PCRE-8.37-intel-2015a.eb
+++ b/easybuild/easyconfigs/p/PCRE/PCRE-8.37-intel-2015a.eb
@@ -13,6 +13,6 @@ toolchainopts = {'optarch': True, 'pic': True}
 source_urls = [SOURCEFORGE_SOURCE]
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = "--with-pic --disable-cpp"
+configopts = "--with-pic --disable-cpp --enable-utf --enable-unicode-properties"
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/p/PCRE/PCRE-8.37-intel-2015b.eb b/easybuild/easyconfigs/p/PCRE/PCRE-8.37-intel-2015b.eb
index ac1733e9122a11105150ad7ab0bd04e00b91ec39..1be2911b8bd50c316d243ec2e189f2efebf918e9 100644
--- a/easybuild/easyconfigs/p/PCRE/PCRE-8.37-intel-2015b.eb
+++ b/easybuild/easyconfigs/p/PCRE/PCRE-8.37-intel-2015b.eb
@@ -15,6 +15,6 @@ toolchainopts = {'optarch': True, 'pic': True}
 source_urls = [SOURCEFORGE_SOURCE]
 sources = [SOURCELOWER_TAR_GZ]
 
-configopts = "--with-pic --disable-cpp"
+configopts = "--with-pic --disable-cpp --enable-utf --enable-unicode-properties"
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/p/PCRE/PCRE-8.38-intel-2016a.eb b/easybuild/easyconfigs/p/PCRE/PCRE-8.38-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..12bd040e3cdcce6917583e7eff026459086c99ec
--- /dev/null
+++ b/easybuild/easyconfigs/p/PCRE/PCRE-8.38-intel-2016a.eb
@@ -0,0 +1,20 @@
+easyblock = 'ConfigureMake'
+
+name = 'PCRE'
+version = '8.38'
+
+homepage = 'http://www.pcre.org/'
+description = """
+ The PCRE library is a set of functions that implement regular expression pattern matching using the same syntax
+ and semantics as Perl 5.
+"""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+toolchainopts = {'optarch': True, 'pic': True}
+
+source_urls = [SOURCEFORGE_SOURCE]
+sources = [SOURCELOWER_TAR_GZ]
+
+configopts = "--with-pic --disable-cpp --enable-utf --enable-unicode-properties"
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/p/PETSc/PETSc-3.3-p2-goalf-1.1.0-no-OFED-Python-2.7.3.eb b/easybuild/easyconfigs/p/PETSc/PETSc-3.3-p2-goalf-1.1.0-no-OFED-Python-2.7.3.eb
index 18d3b422b6a7718cb72c366fde3ff5092ae6ac9b..c4c168cc77ff6ba41e4a6237b3836046f4ecc495 100644
--- a/easybuild/easyconfigs/p/PETSc/PETSc-3.3-p2-goalf-1.1.0-no-OFED-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/p/PETSc/PETSc-3.3-p2-goalf-1.1.0-no-OFED-Python-2.7.3.eb
@@ -13,15 +13,15 @@ source_urls = ['http://ftp.mcs.anl.gov/pub/petsc/release-snapshots']
 sources = [SOURCELOWER_TAR_GZ]
 
 dependencies = [
-               ('Boost', '1.49.0', versionsuffix),
-               ('FIAT', '1.0.0', versionsuffix),
-               ('METIS', '5.0.2'),
-               ('ParMETIS', '4.0.2'),
-               ('ScientificPython', '2.8', versionsuffix),
-               ('SCOTCH', '5.1.12b_esmumps'),
-               ('SuiteSparse', '3.7.0', '-withparmetis'),  # for CHOLMOD, UMFPACK
-               ('Hypre', '2.8.0b'),
-               ]
+    ('Boost', '1.49.0', versionsuffix),
+    ('FIAT', '1.0.0', versionsuffix),
+    ('METIS', '5.0.2'),
+    ('ParMETIS', '4.0.2'),
+    ('ScientificPython', '2.8', versionsuffix),
+    ('SCOTCH', '5.1.12b_esmumps'),
+    ('SuiteSparse', '3.7.0', '-withparmetis'),  # for CHOLMOD, UMFPACK
+    ('Hypre', '2.8.0b'),
+]
 
 patches = ['PETSc_ranlib-fix.patch']
 
diff --git a/easybuild/easyconfigs/p/PETSc/PETSc-3.3-p2-ictce-4.0.6-Python-2.7.3.eb b/easybuild/easyconfigs/p/PETSc/PETSc-3.3-p2-ictce-4.0.6-Python-2.7.3.eb
index 268ce3ce62d898cc68255b9f3e823a689729ff15..d89cdda6370ebd4cd658b4bd92e5d0edc82a8de1 100644
--- a/easybuild/easyconfigs/p/PETSc/PETSc-3.3-p2-ictce-4.0.6-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/p/PETSc/PETSc-3.3-p2-ictce-4.0.6-Python-2.7.3.eb
@@ -13,15 +13,15 @@ source_urls = ['http://ftp.mcs.anl.gov/pub/petsc/release-snapshots']
 sources = [SOURCELOWER_TAR_GZ]
 
 dependencies = [
-               ('Boost', '1.49.0', versionsuffix),
-               ('FIAT', '1.0.0', versionsuffix),
-               ('METIS', '5.0.2'),
-               ('ParMETIS', '4.0.2'),
-               ('ScientificPython', '2.8', versionsuffix),
-               ('SCOTCH', '5.1.12b_esmumps'),
-               ('SuiteSparse', '3.7.0', '-withparmetis'),  # for CHOLMOD, UMFPACK
-               ('Hypre', '2.8.0b'),
-               ]
+    ('Boost', '1.49.0', versionsuffix),
+    ('FIAT', '1.0.0', versionsuffix),
+    ('METIS', '5.0.2'),
+    ('ParMETIS', '4.0.2'),
+    ('ScientificPython', '2.8', versionsuffix),
+    ('SCOTCH', '5.1.12b_esmumps'),
+    ('SuiteSparse', '3.7.0', '-withparmetis'),  # for CHOLMOD, UMFPACK
+    ('Hypre', '2.8.0b'),
+]
 
 patches = ['PETSc_ranlib-fix.patch']
 
diff --git a/easybuild/easyconfigs/p/PETSc/PETSc-3.3-p2-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/p/PETSc/PETSc-3.3-p2-ictce-5.3.0-Python-2.7.3.eb
index eae0fe6ff43a4c440a4d11886a36ba0a71472043..193d113315c25ffb731d7264eebb623f710dd0b0 100644
--- a/easybuild/easyconfigs/p/PETSc/PETSc-3.3-p2-ictce-5.3.0-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/p/PETSc/PETSc-3.3-p2-ictce-5.3.0-Python-2.7.3.eb
@@ -14,15 +14,15 @@ source_urls = ['http://ftp.mcs.anl.gov/pub/petsc/release-snapshots']
 sources = [SOURCELOWER_TAR_GZ]
 
 dependencies = [
-               ('Boost', '1.49.0', versionsuffix),
-               ('FIAT', '1.0.0', versionsuffix),
-               ('METIS', '5.0.2'),
-               ('ParMETIS', '4.0.2'),
-               ('ScientificPython', '2.8', versionsuffix),
-               ('SCOTCH', '5.1.12b_esmumps'),
-               ('SuiteSparse', '3.7.0', '-withparmetis'),  # for CHOLMOD, UMFPACK
-               ('Hypre', '2.8.0b'),
-               ]
+    ('Boost', '1.49.0', versionsuffix),
+    ('FIAT', '1.0.0', versionsuffix),
+    ('METIS', '5.0.2'),
+    ('ParMETIS', '4.0.2'),
+    ('ScientificPython', '2.8', versionsuffix),
+    ('SCOTCH', '5.1.12b_esmumps'),
+    ('SuiteSparse', '3.7.0', '-withparmetis'),  # for CHOLMOD, UMFPACK
+    ('Hypre', '2.8.0b'),
+]
 
 patches = ['PETSc_ranlib-fix.patch']
 
diff --git a/easybuild/easyconfigs/p/PLINK/PLINK-1.07-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/p/PLINK/PLINK-1.07-goalf-1.1.0-no-OFED.eb
index 608da74a7b7a4b1962e6ea00dc9683eb0975a66c..71cade10ffdae658b308f3c51c6cf056d8fbf53c 100644
--- a/easybuild/easyconfigs/p/PLINK/PLINK-1.07-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/p/PLINK/PLINK-1.07-goalf-1.1.0-no-OFED.eb
@@ -6,7 +6,7 @@
 # License::   MIT/GPL
 #
 ##
-easyblock='MakeCp'
+easyblock = 'MakeCp'
 
 name = 'PLINK'
 version = '1.07'
diff --git a/easybuild/easyconfigs/p/PLINK/PLINK-1.07-ictce-5.3.0.eb b/easybuild/easyconfigs/p/PLINK/PLINK-1.07-ictce-5.3.0.eb
index f40f41e97886c6a751c8f13c3ea102dd1418dadc..136c6e53e0f3000ba11c397f8f15e50f9f7e0f4d 100644
--- a/easybuild/easyconfigs/p/PLINK/PLINK-1.07-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/p/PLINK/PLINK-1.07-ictce-5.3.0.eb
@@ -6,7 +6,7 @@
 # License::   MIT/GPL
 #
 ##
-easyblock='MakeCp'
+easyblock = 'MakeCp'
 
 name = 'PLINK'
 version = '1.07'
diff --git a/easybuild/easyconfigs/p/PLINK/PLINK-1.07-ictce-6.2.5.eb b/easybuild/easyconfigs/p/PLINK/PLINK-1.07-ictce-6.2.5.eb
index 785161afd73b20689e3c8d48e783bb05f79ed3e3..0a3b48db5b713e79644b50e7c0e1287bf37305ee 100644
--- a/easybuild/easyconfigs/p/PLINK/PLINK-1.07-ictce-6.2.5.eb
+++ b/easybuild/easyconfigs/p/PLINK/PLINK-1.07-ictce-6.2.5.eb
@@ -3,7 +3,7 @@
 # Swiss Institute of Bioinformatics
 # Biozentrum - University of Basel
 
-easyblock='MakeCp'
+easyblock = 'MakeCp'
 
 name = 'PLINK'
 version = '1.07'
diff --git a/easybuild/easyconfigs/p/PLUMED/PLUMED-2.1.4-foss-2015b.eb b/easybuild/easyconfigs/p/PLUMED/PLUMED-2.1.4-foss-2015b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..9cac08c076f5b5de372c817ae126ea7992ae7c4d
--- /dev/null
+++ b/easybuild/easyconfigs/p/PLUMED/PLUMED-2.1.4-foss-2015b.eb
@@ -0,0 +1,42 @@
+# by Ward Poelmans <wpoely86@gmail.com>
+
+easyblock = 'ConfigureMake'
+
+name = 'PLUMED'
+version = '2.1.4'
+
+homepage = 'http://www.plumed-code.org'
+description = """PLUMED is an open source library for free energy calculations in molecular systems which
+ works together with some of the most popular molecular dynamics engines. Free energy calculations can be 
+ performed as a function of many order parameters with a particular  focus on biological problems, using
+ state of the art methods such as metadynamics, umbrella sampling and Jarzynski-equation based steered MD.
+ The software, written in C++, can be easily interfaced with both fortran and C/C++ codes.
+"""
+
+toolchain = {'name': 'foss', 'version': '2015b'}
+toolchainopts = {'usempi': 'True'}
+
+source_urls = ['https://github.com/plumed/plumed2/archive/']
+sources = ['v%(version)s.tar.gz']
+
+dependencies = [
+    ('zlib', '1.2.8'),
+    ('GSL', '1.16'),
+    ('libmatheval', '1.1.11'),
+]
+
+preconfigopts = 'FC=$MPIF90 LIBS="$LIBLAPACK $LIBS" '
+configopts = ' --exec-prefix=%(installdir)s --enable-gsl'
+prebuildopts = 'source sourceme.sh && '
+
+sanity_check_paths = {
+    'files': ['bin/plumed', 'lib/libplumedKernel.%s' % SHLIB_EXT, 'lib/libplumed.%s' % SHLIB_EXT],
+    'dirs': ['lib/plumed']
+}
+
+modextrapaths = {
+    'PLUMED_KERNEL': 'lib/libplumedKernel.%s' % SHLIB_EXT,
+    'PLUMED_ROOT': 'lib/plumed',
+}
+
+moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/p/PLUMED/PLUMED-2.2.0-intel-2015b.eb b/easybuild/easyconfigs/p/PLUMED/PLUMED-2.2.0-intel-2015b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..c6b4f4fabd6169e02d59003a044b12f5318bff83
--- /dev/null
+++ b/easybuild/easyconfigs/p/PLUMED/PLUMED-2.2.0-intel-2015b.eb
@@ -0,0 +1,42 @@
+# by Ward Poelmans <wpoely86@gmail.com>
+
+easyblock = 'ConfigureMake'
+
+name = 'PLUMED'
+version = '2.2.0'
+
+homepage = 'http://www.plumed-code.org'
+description = """PLUMED is an open source library for free energy calculations in molecular systems which
+ works together with some of the most popular molecular dynamics engines. Free energy calculations can be 
+ performed as a function of many order parameters with a particular  focus on biological problems, using
+ state of the art methods such as metadynamics, umbrella sampling and Jarzynski-equation based steered MD.
+ The software, written in C++, can be easily interfaced with both fortran and C/C++ codes.
+"""
+
+toolchain = {'name': 'intel', 'version': '2015b'}
+toolchainopts = {'usempi': 'True'}
+
+source_urls = ['https://github.com/plumed/plumed2/archive/']
+sources = ['v%(version)s.tar.gz']
+
+dependencies = [
+    ('zlib', '1.2.8'),
+    ('GSL', '1.16'),
+    ('libmatheval', '1.1.11'),
+]
+
+preconfigopts = 'FC=$MPIF90 LIBS="$LIBLAPACK $LIBS" '
+configopts = ' --exec-prefix=%(installdir)s --enable-gsl'
+prebuildopts = 'source sourceme.sh && '
+
+sanity_check_paths = {
+    'files': ['bin/plumed', 'lib/libplumedKernel.%s' % SHLIB_EXT, 'lib/libplumed.%s' % SHLIB_EXT],
+    'dirs': ['lib/plumed']
+}
+
+modextrapaths = {
+    'PLUMED_KERNEL': 'lib/libplumedKernel.%s' % SHLIB_EXT,
+    'PLUMED_ROOT': 'lib/plumed',
+}
+
+moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/p/PLUMED/PLUMED-2.2.1-foss-2015b.eb b/easybuild/easyconfigs/p/PLUMED/PLUMED-2.2.1-foss-2015b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..f3480b9f428573e29ab9f12164b8511f8425617b
--- /dev/null
+++ b/easybuild/easyconfigs/p/PLUMED/PLUMED-2.2.1-foss-2015b.eb
@@ -0,0 +1,42 @@
+# by Ward Poelmans <wpoely86@gmail.com>
+
+easyblock = 'ConfigureMake'
+
+name = 'PLUMED'
+version = '2.2.1'
+
+homepage = 'http://www.plumed-code.org'
+description = """PLUMED is an open source library for free energy calculations in molecular systems which
+ works together with some of the most popular molecular dynamics engines. Free energy calculations can be 
+ performed as a function of many order parameters with a particular  focus on biological problems, using
+ state of the art methods such as metadynamics, umbrella sampling and Jarzynski-equation based steered MD.
+ The software, written in C++, can be easily interfaced with both fortran and C/C++ codes.
+"""
+
+toolchain = {'name': 'foss', 'version': '2015b'}
+toolchainopts = {'usempi': 'True'}
+
+source_urls = ['https://github.com/plumed/plumed2/archive/']
+sources = ['v%(version)s.tar.gz']
+
+dependencies = [
+    ('zlib', '1.2.8'),
+    ('GSL', '2.1'),
+    ('libmatheval', '1.1.11'),
+]
+
+preconfigopts = 'FC=$MPIF90 LIBS="$LIBLAPACK $LIBS" '
+configopts = ' --exec-prefix=%(installdir)s --enable-gsl'
+prebuildopts = 'source sourceme.sh && '
+
+sanity_check_paths = {
+    'files': ['bin/plumed', 'lib/libplumedKernel.%s' % SHLIB_EXT, 'lib/libplumed.%s' % SHLIB_EXT],
+    'dirs': ['lib/plumed']
+}
+
+modextrapaths = {
+    'PLUMED_KERNEL': 'lib/libplumedKernel.%s' % SHLIB_EXT,
+    'PLUMED_ROOT': 'lib/plumed',
+}
+
+moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/p/PLUMED/PLUMED-2.2.1-intel-2015b.eb b/easybuild/easyconfigs/p/PLUMED/PLUMED-2.2.1-intel-2015b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..a8664f7399080fd7b6a5e8097efc264d8a247abd
--- /dev/null
+++ b/easybuild/easyconfigs/p/PLUMED/PLUMED-2.2.1-intel-2015b.eb
@@ -0,0 +1,42 @@
+# by Ward Poelmans <wpoely86@gmail.com>
+
+easyblock = 'ConfigureMake'
+
+name = 'PLUMED'
+version = '2.2.1'
+
+homepage = 'http://www.plumed-code.org'
+description = """PLUMED is an open source library for free energy calculations in molecular systems which
+ works together with some of the most popular molecular dynamics engines. Free energy calculations can be 
+ performed as a function of many order parameters with a particular  focus on biological problems, using
+ state of the art methods such as metadynamics, umbrella sampling and Jarzynski-equation based steered MD.
+ The software, written in C++, can be easily interfaced with both fortran and C/C++ codes.
+"""
+
+toolchain = {'name': 'intel', 'version': '2015b'}
+toolchainopts = {'usempi': 'True'}
+
+source_urls = ['https://github.com/plumed/plumed2/archive/']
+sources = ['v%(version)s.tar.gz']
+
+dependencies = [
+    ('zlib', '1.2.8'),
+    ('GSL', '2.1'),
+    ('libmatheval', '1.1.11'),
+]
+
+preconfigopts = 'FC=$MPIF90 LIBS="$LIBLAPACK $LIBS" '
+configopts = ' --exec-prefix=%(installdir)s --enable-gsl'
+prebuildopts = 'source sourceme.sh && '
+
+sanity_check_paths = {
+    'files': ['bin/plumed', 'lib/libplumedKernel.%s' % SHLIB_EXT, 'lib/libplumed.%s' % SHLIB_EXT],
+    'dirs': ['lib/plumed']
+}
+
+modextrapaths = {
+    'PLUMED_KERNEL': 'lib/libplumedKernel.%s' % SHLIB_EXT,
+    'PLUMED_ROOT': 'lib/plumed',
+}
+
+moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/p/PRACE/PRACE-20130605-goolf-1.4.10.eb b/easybuild/easyconfigs/p/PRACE/PRACE-20130605-goolf-1.4.10.eb
index 849c3d613e2ee8adc8eb6b6fb5198aff52f31936..1cdadae78c70b957483dfc5857c52968c900b672 100644
--- a/easybuild/easyconfigs/p/PRACE/PRACE-20130605-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/p/PRACE/PRACE-20130605-goolf-1.4.10.eb
@@ -29,7 +29,7 @@ dependencies = [
     ('tcsh', '6.18.01'),
     ('Tcl', '8.5.12'),
     ('Tk', '8.5.12'),
-    ('netCDF', '4.1.3'), # this one will also bring in HDF5
+    ('netCDF', '4.1.3'),  # this one will also bring in HDF5
     ('Perl', '5.16.3'),
 ]
 
diff --git a/easybuild/easyconfigs/p/PRACE/PRACE-20130605-ictce-5.3.0.eb b/easybuild/easyconfigs/p/PRACE/PRACE-20130605-ictce-5.3.0.eb
index 63cc6c8164b31069dd2ff65826d2c34bc6f2fc60..6807550e34fa4f7c017beb030462f0a75d3fd75c 100644
--- a/easybuild/easyconfigs/p/PRACE/PRACE-20130605-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/p/PRACE/PRACE-20130605-ictce-5.3.0.eb
@@ -29,7 +29,7 @@ dependencies = [
     ('tcsh', '6.18.01'),
     ('Tcl', '8.5.12'),
     ('Tk', '8.5.12'),
-    ('netCDF', '4.1.3'), # this one will also bring in HDF5
+    ('netCDF', '4.1.3'),  # this one will also bring in HDF5
     ('Perl', '5.16.3'),
 ]
 
diff --git a/easybuild/easyconfigs/p/PRINSEQ/PRINSEQ-0.20.4-goolf-1.4.10-Perl-5.16.3.eb b/easybuild/easyconfigs/p/PRINSEQ/PRINSEQ-0.20.4-goolf-1.4.10-Perl-5.16.3.eb
new file mode 100644
index 0000000000000000000000000000000000000000..fc0341658f6343cf4ccf2b1e0c703af92b02cef7
--- /dev/null
+++ b/easybuild/easyconfigs/p/PRINSEQ/PRINSEQ-0.20.4-goolf-1.4.10-Perl-5.16.3.eb
@@ -0,0 +1,116 @@
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+# Author: Pablo Escobar Lopez
+# sciCORE - University of Basel
+# SIB Swiss Institute of Bioinformatics 
+
+easyblock = 'Tarball'
+
+name = 'PRINSEQ'
+version = '0.20.4'
+
+homepage = 'http://prinseq.sourceforge.net'
+description = """A bioinformatics tool to PRe-process and show INformation of SEQuence data."""
+
+toolchain = {'name': 'goolf', 'version': '1.4.10'}
+
+source_urls = ['http://sourceforge.net/projects/prinseq/files/standalone/']
+sources = ['%(namelower)s-lite-%(version)s.tar.gz']
+
+perl = 'Perl'
+perlver = '5.16.3'
+versionsuffix = '-%s-%s' % (perl, perlver)
+
+dependencies = [
+    (perl, perlver),
+]
+
+# these are the perl libraries dependencies
+exts_defaultclass = 'PerlModule'
+exts_filter = ("perldoc -lm %(ext_name)s ", "")
+
+exts_list = [
+    ('ExtUtils::Depends', '0.405', {
+         'source_tmpl': 'ExtUtils-Depends-0.405.tar.gz',
+         'source_urls': ['https://cpan.metacpan.org/authors/id/X/XA/XAOC/'],
+    }),
+    ('ExtUtils::PkgConfig', '1.15', {
+         'source_tmpl': 'ExtUtils-PkgConfig-1.15.tar.gz',
+         'source_urls': ['https://cpan.metacpan.org/authors/id/X/XA/XAOC/'],
+    }),
+    ('Getopt::Long', '2.48', {
+         'source_tmpl': 'Getopt-Long-2.48.tar.gz',
+         'source_urls': ['https://cpan.metacpan.org/authors/id/J/JV/JV/'],
+    }),
+    ('Pod::Usage', '1.68', {
+        'source_tmpl': 'Pod-Usage-1.68.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/M/MA/MAREKR/'],
+    }),
+    ('File::Temp', '0.2304', {
+        'source_tmpl': 'File-Temp-0.2304.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DA/DAGOLDEN/'],
+    }),
+    ('Digest::MD5', '2.54', {
+        'source_tmpl': 'Digest-MD5-2.54.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/G/GA/GAAS/'],
+    }),
+    ('File::Spec', '3.62', {
+        'source_tmpl': 'PathTools-3.62.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RJ/RJBS/'],
+    }),
+    ('JSON', '2.90', {
+        'source_tmpl': 'JSON-2.90.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/M/MA/MAKAMAKA/'],
+    }),
+    ('Cairo', '1.106', {
+        'source_tmpl': 'Cairo-1.106.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/X/XA/XAOC/'],
+    }),
+    ('Statistics::PCA', '0.0.1', {
+        'source_tmpl': 'Statistics-PCA-0.0.1.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DS/DSTH/'],
+    }),
+    ('MIME::Base64', '3.15', {
+        'source_tmpl': 'MIME-Base64-3.15.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/G/GA/GAAS/'],
+    }),
+    ('Math::Cephes::Matrix', '0.5304', {
+        'source_tmpl': 'Math-Cephes-0.5304.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/S/SH/SHLOMIF/'],
+    }),
+    ('Math::MatrixReal', '2.12', {
+        'source_tmpl': 'Math-MatrixReal-2.12.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/L/LE/LETO/'],
+    }),
+    ('Text::SimpleTable', '2.03', {
+        'source_tmpl': 'Text-SimpleTable-2.03.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/M/MR/MRAMBERG/'],
+    }),
+    ('Contextual::Return', '0.004008', {
+        'source_tmpl': 'Contextual-Return-0.004008.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DC/DCONWAY/'],
+    }),
+    ('Want', '0.26', {
+        'source_tmpl': 'Want-0.26.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RO/ROBIN/'],
+    }),
+]
+
+# this is the script which relies in many extra Perl libraries so we verify it's working fine
+sanity_check_commands = [('perl', '%(installdir)s/prinseq-graphs.pl')]
+
+modextrapaths = {
+    'PATH': "", # add installation dir to PATH
+    'PERL5LIB': 'lib/perl5/site_perl/%s/' % (perlver)
+}
+
+postinstallcmds = [
+    "sed -i -e 's|/usr/bin/perl|/usr/bin/env\ perl|' %(installdir)s/*.pl", # fix shebang line
+    "chmod +x %(installdir)s/*.pl" # add execution permission
+]  
+
+sanity_check_paths = {
+    'files': ['prinseq-lite.pl', 'prinseq-graphs.pl', 'prinseq-graphs-noPCA.pl'],
+    'dirs': []
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/p/PROJ/PROJ-4.8.0-foss-2015b.eb b/easybuild/easyconfigs/p/PROJ/PROJ-4.8.0-foss-2015b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..8e0db7e9a170db6194c106e125e95c70a0144722
--- /dev/null
+++ b/easybuild/easyconfigs/p/PROJ/PROJ-4.8.0-foss-2015b.eb
@@ -0,0 +1,29 @@
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2014-2015 The Cyprus Institute
+# Authors:: Thekla Loizou <t.loizou@cyi.ac.cy>
+# License:: MIT/GPL
+#
+##
+easyblock = 'ConfigureMake'
+
+name = 'PROJ'
+version = '4.8.0'
+
+homepage = 'http://trac.osgeo.org/proj/'
+description = """Program proj is a standard Unix filter function which converts 
+geographic longitude and latitude coordinates into cartesian coordinates"""
+
+toolchain = {'name': 'foss', 'version': '2015b'}
+toolchainopts = {'opt': True, 'pic': True, 'usempi': True}
+
+source_urls = ['http://download.osgeo.org/proj/']
+sources = [SOURCELOWER_TAR_GZ]
+
+sanity_check_paths = {
+    'files': ['bin/cs2cs', 'bin/geod', 'bin/invgeod', 'bin/invproj', 
+              'bin/nad2bin', 'bin/proj'],
+    'dirs': [],
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/p/PROJ/PROJ-4.9.1-foss-2015a.eb b/easybuild/easyconfigs/p/PROJ/PROJ-4.9.1-foss-2015a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..ce218bd9f2f67a4d7202a617feafa4fc74329f11
--- /dev/null
+++ b/easybuild/easyconfigs/p/PROJ/PROJ-4.9.1-foss-2015a.eb
@@ -0,0 +1,30 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2014-2015 The Cyprus Institute
+# Authors:: Thekla Loizou <t.loizou@cyi.ac.cy>
+# License:: MIT/GPL
+#
+##
+easyblock = 'ConfigureMake'
+
+name = 'PROJ'
+version = '4.9.1'
+
+homepage = 'http://trac.osgeo.org/proj/'
+description = """Program proj is a standard Unix filter function which converts 
+geographic longitude and latitude coordinates into cartesian coordinates"""
+
+toolchain = {'name': 'foss', 'version': '2015a'}
+toolchainopts = {'opt': True, 'pic': True, 'usempi': True}
+
+source_urls = ['http://download.osgeo.org/proj/']
+sources = [SOURCELOWER_TAR_GZ]
+
+sanity_check_paths = {
+    'files': ['bin/cs2cs', 'bin/geod', 'bin/invgeod', 'bin/invproj', 
+              'bin/nad2bin', 'bin/proj'],
+    'dirs': [],
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/p/PSI/PSI-4.0b6-20150228-intel-2015a-mt.eb b/easybuild/easyconfigs/p/PSI/PSI-4.0b6-20150228-intel-2015a-mt.eb
index 2550e2c13610d2eb234f0bfcb93fd789ea3718d0..5fa710dd00a96ecf742a2b7a55682cc42744d2f0 100644
--- a/easybuild/easyconfigs/p/PSI/PSI-4.0b6-20150228-intel-2015a-mt.eb
+++ b/easybuild/easyconfigs/p/PSI/PSI-4.0b6-20150228-intel-2015a-mt.eb
@@ -28,7 +28,7 @@ dependencies = [
 
 builddependencies = [
     ('CMake', '3.1.3'),
-    ('Perl', '5.20.1', '-bare'), # for the test suite
+    ('Perl', '5.20.1', '-bare'),  # for the test suite
 ]
 
 # Execute only the 'quick' tests and run 4 in parallel
diff --git a/easybuild/easyconfigs/p/PSI/PSI-4.0b6-20150814-intel-2015a-mt-maxam7-Python-2.7.10.eb b/easybuild/easyconfigs/p/PSI/PSI-4.0b6-20150814-intel-2015a-mt-maxam7-Python-2.7.10.eb
index 46a224ce66c4a026cbb16f9d26644260978ae08d..77a45e9e57c1606d4998ad93c7c35da5dabeab28 100644
--- a/easybuild/easyconfigs/p/PSI/PSI-4.0b6-20150814-intel-2015a-mt-maxam7-Python-2.7.10.eb
+++ b/easybuild/easyconfigs/p/PSI/PSI-4.0b6-20150814-intel-2015a-mt-maxam7-Python-2.7.10.eb
@@ -31,7 +31,7 @@ dependencies = [
 
 builddependencies = [
     ('CMake', '3.2.3'),
-    ('Perl', '5.20.1', '-bare'), # for the test suite
+    ('Perl', '5.20.1', '-bare'),  # for the test suite
 ]
 
 # Execute only the 'quick' tests and run 4 in parallel
diff --git a/easybuild/easyconfigs/p/PSI/PSI-4.0b6-20160201-fix-gitversion.patch b/easybuild/easyconfigs/p/PSI/PSI-4.0b6-20160201-fix-gitversion.patch
new file mode 100644
index 0000000000000000000000000000000000000000..93d3b7eab487a5e14e5db21f80ee8e536ffb7f9b
--- /dev/null
+++ b/easybuild/easyconfigs/p/PSI/PSI-4.0b6-20160201-fix-gitversion.patch
@@ -0,0 +1,12 @@
+# As we have a git version without the git metadata, we tell it which commit we have used
+# by wpoely86@gmail.com
+diff -ur psi4public-e4070d0024742579a445e084da9dde078310094d.orig/src/bin/psi4/gitversion.py psi4public-e4070d0024742579a445e084da9dde078310094d/src/bin/psi4/gitversion.py
+--- psi4public-e4070d0024742579a445e084da9dde078310094d.orig/src/bin/psi4/gitversion.py	2016-02-01 22:43:36.000000000 +0100
++++ psi4public-e4070d0024742579a445e084da9dde078310094d/src/bin/psi4/gitversion.py	2016-02-04 11:41:37.287312135 +0100
+@@ -104,4 +104,5 @@
+     ghash = ''
+     mmp = ''
+ 
+-write_version(branch, mmp, ghash, status)
++#write_version(branch, mmp, ghash, status)
++write_version('master', None, 'e4070d002474257', '')
diff --git a/easybuild/easyconfigs/p/PSI/PSI-4.0b6-20160201-intel-2016a-mt-Python-2.7.11.eb b/easybuild/easyconfigs/p/PSI/PSI-4.0b6-20160201-intel-2016a-mt-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..3f257ab0c149bcbc5384f3655c977f5fc4424505
--- /dev/null
+++ b/easybuild/easyconfigs/p/PSI/PSI-4.0b6-20160201-intel-2016a-mt-Python-2.7.11.eb
@@ -0,0 +1,47 @@
+name = 'PSI'
+version = '4.0b6-20160201'
+versionsuffix = '-mt'
+
+homepage = 'http://www.psicode.org/'
+description = """PSI4 is an open-source suite of ab initio quantum chemistry programs designed for
+ efficient, high-accuracy simulations of a variety of molecular properties. We can routinely perform
+ computations with more than 2500 basis functions running serially or in parallel."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+toolchainopts = {'usempi': False}
+
+source_urls = ['https://github.com/psi4/psi4public/archive/']
+sources = ['e4070d0024742579.tar.gz']
+
+patches = [
+    'PSI-%(version)s-fix-gitversion.patch',
+    'PSI-%(version)s-plugin-fix.patch',
+]
+
+python = 'Python'
+pyver = '2.7.11'
+pysuff = '-%s-%s' % (python, pyver)
+versionsuffix += pysuff
+
+dependencies = [
+    (python, pyver),
+    ('Boost', '1.59.0', pysuff),
+    ('PCMSolver', '20160205', pysuff),
+    ('CheMPS2', '1.6'),
+]
+
+builddependencies = [
+    ('CMake', '3.4.3'),
+    ('Perl', '5.22.1', '-bare'),  # for the test suite
+]
+
+configopts = '-DENABLE_MPI=OFF -DENABLE_OMP=ON -DENABLE_UNIT_TESTS=ON -DENABLE_CHEMPS2=ON -DENABLE_PLUGINS=ON'
+configopts += ' -DENABLE_DUMMY_PLUGIN=ON -DCHEMPS2_ROOT=$EBROOTCHEMPS2'
+configopts += ' -DENABLE_PCMSOLVER=ON -DPCMSOLVER_ROOT=$EBROOTPCMSOLVER'
+
+# Execute 4 tests in parallel
+runtest = 'ARGS="-V -E \'opt10|pubchem1|pubchem2|pywrap-opt-sowreap|sapt4\' -j 4" test'
+
+
+
+moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/p/PSI/PSI-4.0b6-20160201-plugin-fix.patch b/easybuild/easyconfigs/p/PSI/PSI-4.0b6-20160201-plugin-fix.patch
new file mode 100644
index 0000000000000000000000000000000000000000..1cd68c1a98f7727fe0e48eb516a5d034d611a7ff
--- /dev/null
+++ b/easybuild/easyconfigs/p/PSI/PSI-4.0b6-20160201-plugin-fix.patch
@@ -0,0 +1,14 @@
+# Let the plugin makefile system work with our install system: patch the
+# directory path to correspond with our install directory
+# 01/02/2016 - wpoely86@gmail.com
+diff -ur psi4public-e4070d0024742579a445e084da9dde078310094d.orig/CMakeLists.txt psi4public-e4070d0024742579a445e084da9dde078310094d/CMakeLists.txt
+--- psi4public-e4070d0024742579a445e084da9dde078310094d.orig/CMakeLists.txt	2016-02-01 22:43:36.000000000 +0100
++++ psi4public-e4070d0024742579a445e084da9dde078310094d/CMakeLists.txt	2016-02-05 12:40:20.375508374 +0100
+@@ -282,6 +282,7 @@
+ foreach(dir ${dirs})
+     set(PLUGIN_INCLUDE_DIRECTORIES "-I${dir} ${PLUGIN_INCLUDE_DIRECTORIES}")
+ endforeach()
++set(PLUGIN_INCLUDE_DIRECTORIES "-I$ENV{PSI_SRC_INSTALL_DIR}/include -I$ENV{PSI_SRC_INSTALL_DIR}/src/lib/ -I$ENV{PSI_OBJ_INSTALL_DIR}/include -I$ENV{PSI_OBJ_INSTALL_DIR}/src/lib/ ${PLUGIN_INCLUDE_DIRECTORIES}")
+ foreach(def ${defs})
+     set(PLUGIN_DEFINES "-D${def} ${PLUGIN_DEFINES}")
+ endforeach()
diff --git a/easybuild/easyconfigs/p/Pango/Pango-1.36.7-intel-2014b.eb b/easybuild/easyconfigs/p/Pango/Pango-1.36.7-intel-2014b.eb
index cf37090dbc1acc81507ce169fea9df6fb1c800cb..1dae0767df2fc89a40a6e384ad05380d86836eb1 100644
--- a/easybuild/easyconfigs/p/Pango/Pango-1.36.7-intel-2014b.eb
+++ b/easybuild/easyconfigs/p/Pango/Pango-1.36.7-intel-2014b.eb
@@ -16,17 +16,17 @@ source_urls = [FTPGNOME_SOURCE]
 sources = [SOURCELOWER_TAR_XZ]
 
 dependencies = [
-     ('cairo', '1.12.18'),
-     ('fontconfig', '2.11.1'),
-     ('freetype', '2.5.3'),
-     ('GLib', '2.40.0'),
-     ('HarfBuzz', '0.9.35'),
-     ('GObject-Introspection', '1.42.0'),
-     ('libXft', '2.3.2'),
+    ('cairo', '1.12.18'),
+    ('fontconfig', '2.11.1'),
+    ('freetype', '2.5.3'),
+    ('GLib', '2.40.0'),
+    ('HarfBuzz', '0.9.35'),
+    ('GObject-Introspection', '1.42.0'),
+    ('libXft', '2.3.2'),
 ]
 
 builddependencies = [
-     ('M4', '1.4.17'),
+    ('M4', '1.4.17'),
 ]
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/p/Pango/Pango-1.37.2-intel-2015a.eb b/easybuild/easyconfigs/p/Pango/Pango-1.37.2-intel-2015a.eb
index 6e8887ec4ef882e114b0a2ed45efd5a622d75687..2a9ce4d26e295c7e41f9b155bb1c74e17f3d443f 100644
--- a/easybuild/easyconfigs/p/Pango/Pango-1.37.2-intel-2015a.eb
+++ b/easybuild/easyconfigs/p/Pango/Pango-1.37.2-intel-2015a.eb
@@ -16,17 +16,17 @@ source_urls = [FTPGNOME_SOURCE]
 sources = [SOURCELOWER_TAR_XZ]
 
 dependencies = [
-     ('cairo', '1.14.2'),
-     ('fontconfig', '2.11.94'),
-     ('freetype', '2.6'),
-     ('GLib', '2.44.1'),
-     ('HarfBuzz', '1.0.1'),
-     ('GObject-Introspection', '1.44.0'),
-     ('libXft', '2.3.2', '-libX11-1.6.3-Python-2.7.10'),
+    ('cairo', '1.14.2'),
+    ('fontconfig', '2.11.94'),
+    ('freetype', '2.6'),
+    ('GLib', '2.44.1'),
+    ('HarfBuzz', '1.0.1'),
+    ('GObject-Introspection', '1.44.0'),
+    ('libXft', '2.3.2', '-libX11-1.6.3-Python-2.7.10'),
 ]
 
 builddependencies = [
-     ('M4', '1.4.17'),
+    ('M4', '1.4.17'),
 ]
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/p/Pango/Pango-1.38.1-intel-2015b.eb b/easybuild/easyconfigs/p/Pango/Pango-1.38.1-intel-2015b.eb
index bcb85326ff36e21af1110680f4c7fa234df02604..cf2b642da8df7d76ac8970ec669675c415d64a27 100644
--- a/easybuild/easyconfigs/p/Pango/Pango-1.38.1-intel-2015b.eb
+++ b/easybuild/easyconfigs/p/Pango/Pango-1.38.1-intel-2015b.eb
@@ -16,17 +16,17 @@ source_urls = [FTPGNOME_SOURCE]
 sources = [SOURCELOWER_TAR_XZ]
 
 dependencies = [
-     ('cairo', '1.14.4'),
-     ('fontconfig', '2.11.94', '-libpng-1.6.19'),
-     ('freetype', '2.6.1', '-libpng-1.6.19'),
-     ('GLib', '2.47.1'),
-     ('HarfBuzz', '1.1.0'),
-     ('GObject-Introspection', '1.47.1'),
-     ('libXft', '2.3.2', '-libX11-1.6.3-Python-2.7.10'),
+    ('cairo', '1.14.4'),
+    ('fontconfig', '2.11.94', '-libpng-1.6.19'),
+    ('freetype', '2.6.1', '-libpng-1.6.19'),
+    ('GLib', '2.47.1'),
+    ('HarfBuzz', '1.1.0'),
+    ('GObject-Introspection', '1.47.1'),
+    ('libXft', '2.3.2', '-libX11-1.6.3-Python-2.7.10'),
 ]
 
 builddependencies = [
-     ('Autotools', '20150215', '', ('GNU', '4.9.3-2.25')),
+    ('Autotools', '20150215', '', ('GNU', '4.9.3-2.25')),
 ]
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/p/Pango/Pango-1.39.0-intel-2016a.eb b/easybuild/easyconfigs/p/Pango/Pango-1.39.0-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..3dc38160e5dd4014031eb13e7310bb3cb0ce956a
--- /dev/null
+++ b/easybuild/easyconfigs/p/Pango/Pango-1.39.0-intel-2016a.eb
@@ -0,0 +1,31 @@
+easyblock = 'ConfigureMake'
+
+name = 'Pango'
+version = '1.39.0'
+
+homepage = 'http://www.pango.org/'
+description = """Pango is a library for laying out and rendering of text, with an emphasis on internationalization.
+Pango can be used anywhere that text layout is needed, though most of the work on Pango so far has been done in the
+context of the GTK+ widget toolkit. Pango forms the core of text and font handling for GTK+-2.x."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+source_urls = [FTPGNOME_SOURCE]
+sources = [SOURCELOWER_TAR_XZ]
+
+glibver = '2.47.5'
+dependencies = [
+    ('GLib', glibver),
+    ('cairo', '1.14.6'),
+    ('HarfBuzz', '1.1.3'),
+    ('GObject-Introspection', '1.47.1'),
+    ('fontconfig', '2.11.94')
+]
+
+configopts = "--disable-silent-rules --enable-introspection=yes --enable-static --enable-shared "
+
+modextrapaths = {
+    'XDG_DATA_DIRS': 'share',
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/p/ParFlow/ParFlow-605-goolf-1.4.10.eb b/easybuild/easyconfigs/p/ParFlow/ParFlow-605-goolf-1.4.10.eb
index 692186178b9bbd36123f1e049d102669f6807e67..52f17ce9e89dfc3abeaf3afb9934db2ffa6f44d1 100644
--- a/easybuild/easyconfigs/p/ParFlow/ParFlow-605-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/p/ParFlow/ParFlow-605-goolf-1.4.10.eb
@@ -24,8 +24,8 @@ preconfigopts = [
     'cd pftools &&',
 ]
 # copies of preconfigopts are required, not references, hence the [:]
-prebuildopts =  preconfigopts[:]
-preinstallopts =  preconfigopts[:]
+prebuildopts = preconfigopts[:]
+preinstallopts = preconfigopts[:]
 
 configopts = [
     ' --with-amps=mpi1 --enable-timing  --with-clm --with-silo=$EBROOTSILO --with-hypre=$EBROOTHYPRE',
diff --git a/easybuild/easyconfigs/p/ParMETIS/ParMETIS-3.1.1-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/p/ParMETIS/ParMETIS-3.1.1-goalf-1.1.0-no-OFED.eb
index ace5dbc0de86aa945caa9dc85e5186d68c37f9c1..dbaf1f39f5c6d1cb3ec61ddfa1c1e0b4aa53c122 100644
--- a/easybuild/easyconfigs/p/ParMETIS/ParMETIS-3.1.1-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/p/ParMETIS/ParMETIS-3.1.1-goalf-1.1.0-no-OFED.eb
@@ -11,8 +11,10 @@ description = """ParMETIS is an MPI-based parallel library that implements a var
 toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
 toolchainopts = {'optarch': True, 'usempi': True, 'pic': True}
 
-source_urls = ['http://glaros.dtc.umn.edu/gkhome/fetch/sw/parmetis',
-              'http://glaros.dtc.umn.edu/gkhome/fetch/sw/parmetis/OLD']
+source_urls = [
+    'http://glaros.dtc.umn.edu/gkhome/fetch/sw/parmetis',
+    'http://glaros.dtc.umn.edu/gkhome/fetch/sw/parmetis/OLD',
+]
 sources = ['ParMetis-%s.tar.gz' % version]
 
 builddependencies = [('CMake', '2.8.4')]
diff --git a/easybuild/easyconfigs/p/ParMETIS/ParMETIS-3.1.1-goolf-1.4.10.eb b/easybuild/easyconfigs/p/ParMETIS/ParMETIS-3.1.1-goolf-1.4.10.eb
index 1f858cb94c5efdbab118c22c1a1ae0e862a5c0d6..8183de649dd941578a47cde56f936c4b6ef6644f 100644
--- a/easybuild/easyconfigs/p/ParMETIS/ParMETIS-3.1.1-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/p/ParMETIS/ParMETIS-3.1.1-goolf-1.4.10.eb
@@ -11,8 +11,10 @@ description = """ParMETIS is an MPI-based parallel library that implements a var
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 toolchainopts = {'optarch': True, 'usempi': True, 'pic': True}
 
-source_urls = ['http://glaros.dtc.umn.edu/gkhome/fetch/sw/parmetis',
-              'http://glaros.dtc.umn.edu/gkhome/fetch/sw/parmetis/OLD']
+source_urls = [
+    'http://glaros.dtc.umn.edu/gkhome/fetch/sw/parmetis',
+    'http://glaros.dtc.umn.edu/gkhome/fetch/sw/parmetis/OLD',
+]
 sources = ['ParMetis-%s.tar.gz' % version]
 
 builddependencies = [('CMake', '2.8.4')]
diff --git a/easybuild/easyconfigs/p/ParMETIS/ParMETIS-3.1.1-ictce-4.0.6.eb b/easybuild/easyconfigs/p/ParMETIS/ParMETIS-3.1.1-ictce-4.0.6.eb
index 8cf9a16e39f4095a17084bc858e3ff21b0d8ad2a..d03b34a63fec7260bad35d6645973c4bf0ac7473 100644
--- a/easybuild/easyconfigs/p/ParMETIS/ParMETIS-3.1.1-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/p/ParMETIS/ParMETIS-3.1.1-ictce-4.0.6.eb
@@ -11,8 +11,10 @@ description = """ParMETIS is an MPI-based parallel library that implements a var
 toolchain = {'name': 'ictce', 'version': '4.0.6'}
 toolchainopts = {'optarch': True, 'usempi': True, 'pic': True}
 
-source_urls = ['http://glaros.dtc.umn.edu/gkhome/fetch/sw/parmetis',
-              'http://glaros.dtc.umn.edu/gkhome/fetch/sw/parmetis/OLD']
+source_urls = [
+    'http://glaros.dtc.umn.edu/gkhome/fetch/sw/parmetis',
+    'http://glaros.dtc.umn.edu/gkhome/fetch/sw/parmetis/OLD',
+]
 sources = ['ParMetis-%s.tar.gz' % version]
 
 builddependencies = [('CMake', '2.8.4')]
diff --git a/easybuild/easyconfigs/p/ParMETIS/ParMETIS-3.1.1-ictce-5.3.0.eb b/easybuild/easyconfigs/p/ParMETIS/ParMETIS-3.1.1-ictce-5.3.0.eb
index a0f67cdf0d264a60649c4bfe4864fe49a4582088..11db9fe0382c98cb7af56913e33f5eb598932354 100644
--- a/easybuild/easyconfigs/p/ParMETIS/ParMETIS-3.1.1-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/p/ParMETIS/ParMETIS-3.1.1-ictce-5.3.0.eb
@@ -12,8 +12,10 @@ description = """ParMETIS is an MPI-based parallel library that implements a var
 toolchain = {'name': 'ictce', 'version': '5.3.0'}
 toolchainopts = {'optarch': True, 'usempi': True, 'pic': True}
 
-source_urls = ['http://glaros.dtc.umn.edu/gkhome/fetch/sw/parmetis',
-              'http://glaros.dtc.umn.edu/gkhome/fetch/sw/parmetis/OLD']
+source_urls = [
+    'http://glaros.dtc.umn.edu/gkhome/fetch/sw/parmetis',
+    'http://glaros.dtc.umn.edu/gkhome/fetch/sw/parmetis/OLD',
+]
 sources = ['ParMetis-%s.tar.gz' % version]
 
 builddependencies = [('CMake', '2.8.4')]
diff --git a/easybuild/easyconfigs/p/ParMETIS/ParMETIS-4.0.2-gmpolf-1.4.8.eb b/easybuild/easyconfigs/p/ParMETIS/ParMETIS-4.0.2-gmpolf-1.4.8.eb
index a0d6b8d1ed5f10aea0bcb561e82b909375973962..529f9810e3e6998a6fc115fccb69a56157cf03a3 100644
--- a/easybuild/easyconfigs/p/ParMETIS/ParMETIS-4.0.2-gmpolf-1.4.8.eb
+++ b/easybuild/easyconfigs/p/ParMETIS/ParMETIS-4.0.2-gmpolf-1.4.8.eb
@@ -11,8 +11,10 @@ description = """ParMETIS is an MPI-based parallel library that implements a var
 toolchain = {'name': 'gmpolf', 'version': '1.4.8'}
 toolchainopts = {'optarch': True, 'usempi': True, 'pic': True}
 
-source_urls = ['http://glaros.dtc.umn.edu/gkhome/fetch/sw/parmetis',
-              'http://glaros.dtc.umn.edu/gkhome/fetch/sw/parmetis/OLD']
+source_urls = [
+    'http://glaros.dtc.umn.edu/gkhome/fetch/sw/parmetis',
+    'http://glaros.dtc.umn.edu/gkhome/fetch/sw/parmetis/OLD',
+]
 sources = [SOURCELOWER_TAR_GZ]
 
 builddependencies = [('CMake', '2.8.4')]
diff --git a/easybuild/easyconfigs/p/ParMETIS/ParMETIS-4.0.2-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/p/ParMETIS/ParMETIS-4.0.2-goalf-1.1.0-no-OFED.eb
index 7f8da3fb1c401a69c7c4e6439ef4a7af8db1c73e..48d813595b90b32bd3566332958be0a05b3856c6 100644
--- a/easybuild/easyconfigs/p/ParMETIS/ParMETIS-4.0.2-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/p/ParMETIS/ParMETIS-4.0.2-goalf-1.1.0-no-OFED.eb
@@ -11,8 +11,10 @@ description = """ParMETIS is an MPI-based parallel library that implements a var
 toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
 toolchainopts = {'optarch': True, 'usempi': True, 'pic': True}
 
-source_urls = ['http://glaros.dtc.umn.edu/gkhome/fetch/sw/parmetis',
-              'http://glaros.dtc.umn.edu/gkhome/fetch/sw/parmetis/OLD']
+source_urls = [
+    'http://glaros.dtc.umn.edu/gkhome/fetch/sw/parmetis',
+    'http://glaros.dtc.umn.edu/gkhome/fetch/sw/parmetis/OLD',
+]
 sources = [SOURCELOWER_TAR_GZ]
 
 builddependencies = [('CMake', '2.8.4')]
diff --git a/easybuild/easyconfigs/p/ParMETIS/ParMETIS-4.0.2-goolf-1.4.10.eb b/easybuild/easyconfigs/p/ParMETIS/ParMETIS-4.0.2-goolf-1.4.10.eb
index ad06991953371eda222ad276012a57acf5dd4ffe..f4413be29459828872231c11cff8a53292b0508e 100644
--- a/easybuild/easyconfigs/p/ParMETIS/ParMETIS-4.0.2-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/p/ParMETIS/ParMETIS-4.0.2-goolf-1.4.10.eb
@@ -11,8 +11,10 @@ description = """ParMETIS is an MPI-based parallel library that implements a var
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 toolchainopts = {'optarch': True, 'usempi': True, 'pic': True}
 
-source_urls = ['http://glaros.dtc.umn.edu/gkhome/fetch/sw/parmetis',
-              'http://glaros.dtc.umn.edu/gkhome/fetch/sw/parmetis/OLD']
+source_urls = [
+    'http://glaros.dtc.umn.edu/gkhome/fetch/sw/parmetis',
+    'http://glaros.dtc.umn.edu/gkhome/fetch/sw/parmetis/OLD',
+]
 sources = [SOURCELOWER_TAR_GZ]
 
 builddependencies = [('CMake', '2.8.4')]
diff --git a/easybuild/easyconfigs/p/ParMETIS/ParMETIS-4.0.2-ictce-4.0.6.eb b/easybuild/easyconfigs/p/ParMETIS/ParMETIS-4.0.2-ictce-4.0.6.eb
index ef702ef013cee3d9998df7f76c7f60c6d83236c1..10dc4381499c3ff2870ab9832779f2e896585690 100644
--- a/easybuild/easyconfigs/p/ParMETIS/ParMETIS-4.0.2-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/p/ParMETIS/ParMETIS-4.0.2-ictce-4.0.6.eb
@@ -11,8 +11,10 @@ description = """ParMETIS is an MPI-based parallel library that implements a var
 toolchain = {'name': 'ictce', 'version': '4.0.6'}
 toolchainopts = {'optarch': True, 'usempi': True, 'pic': True}
 
-source_urls = ['http://glaros.dtc.umn.edu/gkhome/fetch/sw/parmetis',
-              'http://glaros.dtc.umn.edu/gkhome/fetch/sw/parmetis/OLD']
+source_urls = [
+    'http://glaros.dtc.umn.edu/gkhome/fetch/sw/parmetis',
+    'http://glaros.dtc.umn.edu/gkhome/fetch/sw/parmetis/OLD',
+]
 sources = [SOURCELOWER_TAR_GZ]
 
 builddependencies = [('CMake', '2.8.4')]
diff --git a/easybuild/easyconfigs/p/ParMETIS/ParMETIS-4.0.2-ictce-5.3.0.eb b/easybuild/easyconfigs/p/ParMETIS/ParMETIS-4.0.2-ictce-5.3.0.eb
index a20f70af08c0f29e0588741f03fdac2dcd8692f5..a32790b7f1ea3548822c3f8367fd5f6359f47abe 100644
--- a/easybuild/easyconfigs/p/ParMETIS/ParMETIS-4.0.2-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/p/ParMETIS/ParMETIS-4.0.2-ictce-5.3.0.eb
@@ -12,8 +12,10 @@ description = """ParMETIS is an MPI-based parallel library that implements a var
 toolchain = {'name': 'ictce', 'version': '5.3.0'}
 toolchainopts = {'optarch': True, 'usempi': True, 'pic': True}
 
-source_urls = ['http://glaros.dtc.umn.edu/gkhome/fetch/sw/parmetis',
-              'http://glaros.dtc.umn.edu/gkhome/fetch/sw/parmetis/OLD']
+source_urls = [
+    'http://glaros.dtc.umn.edu/gkhome/fetch/sw/parmetis',
+    'http://glaros.dtc.umn.edu/gkhome/fetch/sw/parmetis/OLD',
+]
 sources = [SOURCELOWER_TAR_GZ]
 
 builddependencies = [('CMake', '2.8.4')]
diff --git a/easybuild/easyconfigs/p/ParaView/ParaView-4.0.1-gmpolf-1.4.8.eb b/easybuild/easyconfigs/p/ParaView/ParaView-4.0.1-gmpolf-1.4.8.eb
index bf58fb84fb56848544e3a9f9d4491c9dcc6b757d..c06c552596077c11dc608d6124b3566ced3e63bd 100644
--- a/easybuild/easyconfigs/p/ParaView/ParaView-4.0.1-gmpolf-1.4.8.eb
+++ b/easybuild/easyconfigs/p/ParaView/ParaView-4.0.1-gmpolf-1.4.8.eb
@@ -13,7 +13,7 @@ download_suffix = 'download.php?submit=Download&version=v%(version_major_minor)s
 source_urls = ['http://www.paraview.org/paraview-downloads/%s' % download_suffix]
 sources = ["ParaView-v%(version)s-source.tgz"]
 
-dependencies = [('Qt','4.8.5')]
+dependencies = [('Qt', '4.8.5')]
 
 builddependencies = [('CMake', '2.8.10.2')]
 
diff --git a/easybuild/easyconfigs/p/ParaView/ParaView-4.1.0-gmpolf-1.4.8.eb b/easybuild/easyconfigs/p/ParaView/ParaView-4.1.0-gmpolf-1.4.8.eb
index bfd42624ef2f3fb3423e73920e4bbbb38f450d0e..63df0fd35a803a696db7e89630cd2f81e793100b 100644
--- a/easybuild/easyconfigs/p/ParaView/ParaView-4.1.0-gmpolf-1.4.8.eb
+++ b/easybuild/easyconfigs/p/ParaView/ParaView-4.1.0-gmpolf-1.4.8.eb
@@ -13,7 +13,7 @@ download_suffix = 'download.php?submit=Download&version=v%(version_major_minor)s
 source_urls = ['http://www.paraview.org/paraview-downloads/%s' % download_suffix]
 sources = ["ParaView-v%(version)s-source.tar.gz"]
 
-dependencies = [('Qt','4.8.5')]
+dependencies = [('Qt', '4.8.5')]
 
 builddependencies = [('CMake', '2.8.10.2')]
 
diff --git a/easybuild/easyconfigs/p/ParaView/ParaView-4.1.0-goolf-1.5.14.eb b/easybuild/easyconfigs/p/ParaView/ParaView-4.1.0-goolf-1.5.14.eb
index 0e83d17a57b07ebe558ed952351030ffd36feb7d..54eca56e62ab0df577cfa5f0d9dc548ee3d662cf 100644
--- a/easybuild/easyconfigs/p/ParaView/ParaView-4.1.0-goolf-1.5.14.eb
+++ b/easybuild/easyconfigs/p/ParaView/ParaView-4.1.0-goolf-1.5.14.eb
@@ -13,7 +13,7 @@ download_suffix = 'download.php?submit=Download&version=v%(version_major_minor)s
 source_urls = ['http://www.paraview.org/paraview-downloads/%s' % download_suffix]
 sources = ["ParaView-v%(version)s-source.tar.gz"]
 
-dependencies = [('Qt','4.8.5')]
+dependencies = [('Qt', '4.8.5')]
 
 builddependencies = [('CMake', '2.8.10.2')]
 
diff --git a/easybuild/easyconfigs/p/ParaView/ParaView-4.1.0-intel-2014b.eb b/easybuild/easyconfigs/p/ParaView/ParaView-4.1.0-intel-2014b.eb
index 04255cc7c7446457c2cec36d7dcf05db748643ab..61e00cb01ab7a5f4cd7f3aadeb555465a1cd3959 100644
--- a/easybuild/easyconfigs/p/ParaView/ParaView-4.1.0-intel-2014b.eb
+++ b/easybuild/easyconfigs/p/ParaView/ParaView-4.1.0-intel-2014b.eb
@@ -13,7 +13,7 @@ download_suffix = 'download.php?submit=Download&version=v%(version_major_minor)s
 source_urls = ['http://www.paraview.org/paraview-downloads/%s' % download_suffix]
 sources = ["ParaView-v%(version)s-source.tar.gz"]
 
-dependencies = [('Qt','4.8.6')]
+dependencies = [('Qt', '4.8.6')]
 
 builddependencies = [('CMake', '3.0.0')]
 
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 609a7355cc18707821c8bb181a4a6b0c67294904..c8116fe14fdfacd208bd296115352a67c13d9fa8 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
@@ -38,15 +38,15 @@ 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 '
 configopts += '-DOSMESA_INCLUDE_DIR=$EBROOTMESA/include -DOSMESA_LIBRARY=$EBROOTMESA/lib/libOSMesa.so '
-#Without internet connection turn off testing (uncomment the following line)
+# Without internet connection turn off testing (uncomment the following line)
 #configopts += '-DBUILD_TESTING=OFF '
-#Or consult https://gitlab.kitware.com/vtk/vtk/blob/master/Documentation/dev/git/data.md
-#and download ExternalData to $EASYBUILD_SOURCEPATH and adjust -DExternalData_OBJECT_STORES accordingly
-#Without internet connection, comment the following two lines (configopts and prebuildopts)
+# Or consult https://gitlab.kitware.com/vtk/vtk/blob/master/Documentation/dev/git/data.md
+# and download ExternalData to $EASYBUILD_SOURCEPATH and adjust -DExternalData_OBJECT_STORES accordingly
+# Without internet connection, comment the following two lines (configopts and prebuildopts)
 configopts += '-DExternalData_OBJECT_STORES=%(builddir)s/ExternalData '
-#The ParaView server can be cranky, test downloads are quite often failing, especially in the case
-#of parallel downloads. Using ; insted of && gives a second chance to download the test files, if the
-#first serial attempt would fail.
+# The ParaView server can be cranky, test downloads are quite often failing, especially in the case
+# of parallel downloads. Using ; insted of && gives a second chance to download the test files, if the
+# first serial attempt would fail.
 prebuildopts = 'make VTKData ;'
 
 moduleclass = 'vis'
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 e5a49a6762f2c6f0fbaeea36352a383d20e6bb35..2e184fd8019defe06ed7f5a084d06a9a56dab2ea 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
@@ -37,15 +37,15 @@ 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 '
 configopts += '-DOSMESA_INCLUDE_DIR=$EBROOTMESA/include -DOSMESA_LIBRARY=$EBROOTMESA/lib/libOSMesa.so '
-#Without internet connection turn off testing (uncomment the following line)
+# Without internet connection turn off testing (uncomment the following line)
 #configopts += '-DBUILD_TESTING=OFF '
-#Or consult https://gitlab.kitware.com/vtk/vtk/blob/master/Documentation/dev/git/data.md
-#and download ExternalData to $EASYBUILD_SOURCEPATH and adjust -DExternalData_OBJECT_STORES accordingly
-#Without internet connection, comment the following two lines (configopts and prebuildopts)
+# Or consult https://gitlab.kitware.com/vtk/vtk/blob/master/Documentation/dev/git/data.md
+# and download ExternalData to $EASYBUILD_SOURCEPATH and adjust -DExternalData_OBJECT_STORES accordingly
+# Without internet connection, comment the following two lines (configopts and prebuildopts)
 configopts += '-DExternalData_OBJECT_STORES=%(builddir)s/ExternalData '
-#The ParaView server can be cranky, test downloads are quite often failing, especially in the case
-#of parallel downloads. Using ; insted of && gives a second chance to download the test files, if the
-#first serial attempt would fail.
+# The ParaView server can be cranky, test downloads are quite often failing, especially in the case
+# of parallel downloads. Using ; insted of && gives a second chance to download the test files, if the
+# first serial attempt would fail.
 prebuildopts = 'make VTKData ;'
 
 moduleclass = 'vis'
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 d675f99ad13dadb1065b4be8c7133cdedea71620..2e7bc45270cfcd09fac2f78b3a774424376d2554 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
@@ -18,7 +18,7 @@ patches = ['%(name)s-%(version)s_missingheader.patch']
 
 python = 'Python'
 pyver = '2.7.10'
-pysuff = '-%s-%s' % (python,pyver)
+pysuff = '-%s-%s' % (python, pyver)
 dependencies = [
     ('Mesa', '11.0.2', pysuff),
     ('libGLU', '9.0.0'),
@@ -38,15 +38,15 @@ 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 '
 configopts += '-DOSMESA_INCLUDE_DIR=$EBROOTMESA/include -DOSMESA_LIBRARY=$EBROOTMESA/lib/libOSMesa.so '
-#Without internet connection turn off testing (uncomment the following line)
+# Without internet connection turn off testing (uncomment the following line)
 #configopts += '-DBUILD_TESTING=OFF '
-#Or consult https://gitlab.kitware.com/vtk/vtk/blob/master/Documentation/dev/git/data.md
-#and download ExternalData to $EASYBUILD_SOURCEPATH and adjust -DExternalData_OBJECT_STORES accordingly
-#Without internet connection, comment the following two lines (configopts and prebuildopts)
+# Or consult https://gitlab.kitware.com/vtk/vtk/blob/master/Documentation/dev/git/data.md
+# and download ExternalData to $EASYBUILD_SOURCEPATH and adjust -DExternalData_OBJECT_STORES accordingly
+# Without internet connection, comment the following two lines (configopts and prebuildopts)
 configopts += '-DExternalData_OBJECT_STORES=%(builddir)s/ExternalData '
-#The ParaView server can be cranky, test downloads are quite often failing, especially in the case
-#of parallel downloads. Using ; insted of && gives a second chance to download the test files, if the
-#first serial attempt would fail.
+# The ParaView server can be cranky, test downloads are quite often failing, especially in the case
+# of parallel downloads. Using ; insted of && gives a second chance to download the test files, if the
+# first serial attempt would fail.
 prebuildopts = 'make VTKData ;'
 
 moduleclass = 'vis'
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 63b92b07e568dc5c8d3f386b7482f6128974857b..0057213bea9baabbefe8efc4c88490e2718989d4 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
@@ -17,7 +17,7 @@ patches = ['%(name)s-%(version)s_missingheader.patch']
 
 python = 'Python'
 pyver = '2.7.10'
-pysuff = '-%s-%s' % (python,pyver)
+pysuff = '-%s-%s' % (python, pyver)
 dependencies = [
     ('Mesa', '11.0.2', pysuff),
     ('libGLU', '9.0.0'),
@@ -37,15 +37,15 @@ 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 '
 configopts += '-DOSMESA_INCLUDE_DIR=$EBROOTMESA/include -DOSMESA_LIBRARY=$EBROOTMESA/lib/libOSMesa.so '
-#Without internet connection turn off testing (uncomment the following line)
+# Without internet connection turn off testing (uncomment the following line)
 #configopts += '-DBUILD_TESTING=OFF '
-#Or consult https://gitlab.kitware.com/vtk/vtk/blob/master/Documentation/dev/git/data.md
-#and download ExternalData to $EASYBUILD_SOURCEPATH and adjust -DExternalData_OBJECT_STORES accordingly
-#Without internet connection, comment the following two lines (configopts and prebuildopts)
+# Or consult https://gitlab.kitware.com/vtk/vtk/blob/master/Documentation/dev/git/data.md
+# and download ExternalData to $EASYBUILD_SOURCEPATH and adjust -DExternalData_OBJECT_STORES accordingly
+# Without internet connection, comment the following two lines (configopts and prebuildopts)
 configopts += '-DExternalData_OBJECT_STORES=%(builddir)s/ExternalData '
-#The ParaView server can be cranky, test downloads are quite often failing, especially in the case
-#of parallel downloads. Using ; insted of && gives a second chance to download the test files, if the
-#first serial attempt would fail.
+# The ParaView server can be cranky, test downloads are quite often failing, especially in the case
+# of parallel downloads. Using ; insted of && gives a second chance to download the test files, if the
+# first serial attempt would fail.
 prebuildopts = 'make VTKData ;'
 
 moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/p/Pasha/Pasha-1.0.3-ictce-4.0.6.eb b/easybuild/easyconfigs/p/Pasha/Pasha-1.0.3-ictce-4.0.6.eb
index 359a345c5b50d7936473d6faced98cd7e1b0d6cc..61f6c03bfb0fafa9a17c7de5be00ef6005389d07 100644
--- a/easybuild/easyconfigs/p/Pasha/Pasha-1.0.3-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/p/Pasha/Pasha-1.0.3-ictce-4.0.6.eb
@@ -13,10 +13,10 @@ source_urls = ['http://downloads.sourceforge.net/pasha']
 sources = [SOURCE_TAR_GZ]
 
 patches = [
-            'intelmpi.patch',
-             # needed since this still relies on gnu specific includes from libstdc++ which changed in latest version
-            'old-libstdc++-hash_fun-map-set.patch',
-          ]
+    'intelmpi.patch',
+    # needed since this still relies on gnu specific includes from libstdc++ which changed in latest version
+    'old-libstdc++-hash_fun-map-set.patch',
+]
 
 # Pasha's makefile is not suited for parallel execution
 parallel = 1
diff --git a/easybuild/easyconfigs/p/Pasha/Pasha-1.0.3-ictce-5.3.0.eb b/easybuild/easyconfigs/p/Pasha/Pasha-1.0.3-ictce-5.3.0.eb
index cf6204baeadf593f9d158c5524367869d31b3dc9..4043dd5630c1f2c71a2427d4a0fc6f3a467c045e 100644
--- a/easybuild/easyconfigs/p/Pasha/Pasha-1.0.3-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/p/Pasha/Pasha-1.0.3-ictce-5.3.0.eb
@@ -14,10 +14,10 @@ source_urls = ['http://downloads.sourceforge.net/pasha']
 sources = [SOURCE_TAR_GZ]
 
 patches = [
-            'intelmpi.patch',
-             # needed since this still relies on gnu specific includes from libstdc++ which changed in latest version
-            'old-libstdc++-hash_fun-map-set.patch',
-          ]
+    'intelmpi.patch',
+    # needed since this still relies on gnu specific includes from libstdc++ which changed in latest version
+    'old-libstdc++-hash_fun-map-set.patch',
+]
 
 # Pasha's makefile is not suited for parallel execution
 parallel = 1
diff --git a/easybuild/easyconfigs/p/Pasha/Pasha-1.0.5-ictce-4.0.6.eb b/easybuild/easyconfigs/p/Pasha/Pasha-1.0.5-ictce-4.0.6.eb
index 65d0ec04e7e388c8debc53d03b5d297aea2b895f..1d85521e587ebbeb36524ac4d244ea89e45b9b1c 100644
--- a/easybuild/easyconfigs/p/Pasha/Pasha-1.0.5-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/p/Pasha/Pasha-1.0.5-ictce-4.0.6.eb
@@ -13,12 +13,12 @@ source_urls = ['http://downloads.sourceforge.net/pasha']
 sources = [SOURCE_TAR_GZ]
 
 patches = [
-            'intelmpi.patch',
-            # needed since this still relies on gnu specific includes from libstdc++ which changed in latest version of libstdc++
-            # since 1.0.5 pasha tries to use 'backward/' instead of 'ext/' but this might fail on some systems.
-            'old-libstdc++-hash_fun-map-set_pasha-1.0.5.patch',
+    'intelmpi.patch',
+    # needed since this still relies on gnu specific includes from libstdc++ which changed in latest version of libstdc++
+    # since 1.0.5 pasha tries to use 'backward/' instead of 'ext/' but this might fail on some systems.
+    'old-libstdc++-hash_fun-map-set_pasha-1.0.5.patch',
 
-          ]
+]
 
 # Pasha's makefile is not suited for parallel execution
 parallel = 1
diff --git a/easybuild/easyconfigs/p/Pasha/Pasha-1.0.5-ictce-5.3.0.eb b/easybuild/easyconfigs/p/Pasha/Pasha-1.0.5-ictce-5.3.0.eb
index 67dc78ccc93dde50be153a36fa5675bef6c3fdba..a72485e97d248bcb6bbc468027a1e65778ad9a29 100644
--- a/easybuild/easyconfigs/p/Pasha/Pasha-1.0.5-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/p/Pasha/Pasha-1.0.5-ictce-5.3.0.eb
@@ -14,12 +14,12 @@ source_urls = ['http://downloads.sourceforge.net/pasha']
 sources = [SOURCE_TAR_GZ]
 
 patches = [
-            'intelmpi.patch',
-            # needed since this still relies on gnu specific includes from libstdc++ which changed in latest version of libstdc++
-            # since 1.0.5 pasha tries to use 'backward/' instead of 'ext/' but this might fail on some systems.
-            'old-libstdc++-hash_fun-map-set_pasha-1.0.5.patch',
+    'intelmpi.patch',
+    # needed since this still relies on gnu specific includes from libstdc++ which changed in latest version of libstdc++
+    # since 1.0.5 pasha tries to use 'backward/' instead of 'ext/' but this might fail on some systems.
+    'old-libstdc++-hash_fun-map-set_pasha-1.0.5.patch',
 
-          ]
+]
 
 # Pasha's makefile is not suited for parallel execution
 parallel = 1
diff --git a/easybuild/easyconfigs/p/PeakSeq/PeakSeq-1.3-goolf-1.4.10.eb b/easybuild/easyconfigs/p/PeakSeq/PeakSeq-1.3-goolf-1.4.10.eb
index 0a7acf4ed3d0cf069e0cea33394e1c39e2537bfc..beddc1be80d02da0ed4f61c26fd683ebf7078c37 100644
--- a/easybuild/easyconfigs/p/PeakSeq/PeakSeq-1.3-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/p/PeakSeq/PeakSeq-1.3-goolf-1.4.10.eb
@@ -24,7 +24,7 @@ checksums = [('md5', '32b4d71b2ec9455c7db69516b1bd4910')]
 
 buildopts = ' CC="$CXX"'
 
-files_to_copy = ["bin", "README" ]
+files_to_copy = ["bin", "README"]
 
 sanity_check_paths = {
     'files': ["bin/PeakSeq"],
diff --git a/easybuild/easyconfigs/p/Perl/Perl-5.18.2-ictce-5.5.0.eb b/easybuild/easyconfigs/p/Perl/Perl-5.18.2-ictce-5.5.0.eb
index 03576a1d0c768b58ff7482177df9a3c4f64e0676..5e44fd7e987cbe66f1e564ef1ea0d5784ecf9b30 100644
--- a/easybuild/easyconfigs/p/Perl/Perl-5.18.2-ictce-5.5.0.eb
+++ b/easybuild/easyconfigs/p/Perl/Perl-5.18.2-ictce-5.5.0.eb
@@ -210,7 +210,7 @@ exts_list = [
         'source_urls': ['http://cpan.metacpan.org/authors/id/E/ET/ETHER/'],
     }),
     ('Moose', '2.1204', {
-       'source_urls': ['http://cpan.metacpan.org/authors/id/E/ET/ETHER/'],
+        'source_urls': ['http://cpan.metacpan.org/authors/id/E/ET/ETHER/'],
     }),
     ('Params::Validate', '1.08', {
         'source_tmpl': 'Params-Validate-1.08.tar.gz',
diff --git a/easybuild/easyconfigs/p/Perl/Perl-5.20.3-foss-2015b.eb b/easybuild/easyconfigs/p/Perl/Perl-5.20.3-foss-2015b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..35f20adfa32ee284cfe7770dc51d53ec4a559765
--- /dev/null
+++ b/easybuild/easyconfigs/p/Perl/Perl-5.20.3-foss-2015b.eb
@@ -0,0 +1,909 @@
+name = 'Perl'
+version = '5.20.3'
+
+homepage = 'http://www.perl.org/'
+description = """Larry Wall's Practical Extraction and Report Language"""
+
+toolchain = {'name': 'foss', 'version': '2015b'}
+toolchainopts = {'optarch': True, 'pic': True}
+
+source_urls = ['http://www.cpan.org/src/5.0']
+sources = [SOURCELOWER_TAR_GZ]
+
+exts_list = [
+    ('Config::General', '2.58', {
+        'source_tmpl': 'Config-General-2.58.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/T/TL/TLINDEN'],
+    }),
+    ('File::Listing', '6.04', {
+        'source_tmpl': 'File-Listing-6.04.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/G/GA/GAAS'],
+    }),
+    ('ExtUtils::InstallPaths', '0.011', {
+        'source_tmpl': 'ExtUtils-InstallPaths-0.011.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/L/LE/LEONT'],
+    }),
+    ('ExtUtils::Helpers', '0.022', {
+        'source_tmpl': 'ExtUtils-Helpers-0.022.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/L/LE/LEONT'],
+    }),
+    ('TAP::Harness::Env', '3.35', {
+        'source_tmpl': 'Test-Harness-3.35.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/L/LE/LEONT'],
+    }),
+    ('ExtUtils::Config', '0.008', {
+        'source_tmpl': 'ExtUtils-Config-0.008.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/L/LE/LEONT'],
+    }),
+    ('Module::Build::Tiny', '0.039', {
+        'source_tmpl': 'Module-Build-Tiny-0.039.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/L/LE/LEONT'],
+    }),
+    ('aliased', '0.34', {
+        'source_tmpl': 'aliased-0.34.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/E/ET/ETHER'],
+    }),
+    ('Text::Glob', '0.09', {
+        'source_tmpl': 'Text-Glob-0.09.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/R/RC/RCLAMP'],
+    }),
+    ('Regexp::Common', '2013031301', {
+        'source_tmpl': 'Regexp-Common-2013031301.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/A/AB/ABIGAIL'],
+    }),
+    ('GO::Utils', '0.15', {
+        'source_tmpl': 'go-perl-0.15.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/C/CM/CMUNGALL'],
+    }),
+    ('Module::Pluggable', '5.2', {
+        'source_tmpl': 'Module-Pluggable-5.2.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/S/SI/SIMONW'],
+    }),
+    ('Test::Fatal', '0.014', {
+        'source_tmpl': 'Test-Fatal-0.014.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RJ/RJBS'],
+    }),
+    ('Test::Warnings', '0.021', {
+        'source_tmpl': 'Test-Warnings-0.021.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/E/ET/ETHER'],
+    }),
+    ('DateTime::Locale', '0.46', {
+        'source_tmpl': 'DateTime-Locale-0.46.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DR/DROLSKY'],
+    }),
+    ('DateTime::TimeZone', '1.93', {
+        'source_tmpl': 'DateTime-TimeZone-1.93.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DR/DROLSKY'],
+    }),
+    ('Test::Requires', '0.10', {
+        'source_tmpl': 'Test-Requires-0.10.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/T/TO/TOKUHIROM'],
+    }),
+    ('Module::Implementation', '0.09', {
+        'source_tmpl': 'Module-Implementation-0.09.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/D/DR/DROLSKY'],
+    }),
+    ('Module::Runtime', '0.014', {
+        'source_tmpl': 'Module-Runtime-0.014.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/Z/ZE/ZEFRAM'],
+    }),
+    ('Try::Tiny', '0.22', {
+        'source_tmpl': 'Try-Tiny-0.22.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/D/DO/DOY'],
+    }),
+    ('Params::Validate', '1.21', {
+        'source_tmpl': 'Params-Validate-1.21.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DR/DROLSKY'],
+    }),
+    ('List::MoreUtils', '0.413', {
+        'source_tmpl': 'List-MoreUtils-0.413.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RE/REHSACK'],
+    }),
+    ('Exporter::Tiny', '0.042', {
+        'source_tmpl': 'Exporter-Tiny-0.042.tar.gz',
+        'source_urls': ['http://search.cpan.org/CPAN/authors/id/T/TO/TOBYINK'],
+    }),
+    ('Class::Singleton', '1.5', {
+        'source_tmpl': 'Class-Singleton-1.5.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/S/SH/SHAY'],
+    }),
+    ('DateTime', '1.20', {
+        'source_tmpl': 'DateTime-1.20.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DR/DROLSKY'],
+    }),
+    ('File::Find::Rule::Perl', '1.15', {
+        'source_tmpl': 'File-Find-Rule-Perl-1.15.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/E/ET/ETHER'],
+    }),
+    ('Module::Build', '0.4214', {
+        'source_tmpl': 'Module-Build-0.4214.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/L/LE/LEONT'],
+    }),
+    ('Readonly', '2.00', {
+        'source_tmpl': 'Readonly-2.00.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/S/SA/SANKO'],
+    }),
+    ('Git', '0.41', {
+        'source_tmpl': 'Git-0.41.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/M/MS/MSOUTH'],
+    }),
+    ('Tree::DAG_Node', '1.27', {
+        'source_tmpl': 'Tree-DAG_Node-1.27.tgz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RS/RSAVAGE'],
+    }),
+    ('Template', '2.26', {
+        'source_tmpl': 'Template-Toolkit-2.26.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/A/AB/ABW'],
+    }),
+    ('FreezeThaw', '0.5001', {
+        'source_tmpl': 'FreezeThaw-0.5001.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/I/IL/ILYAZ/modules'],
+    }),
+    ('DBI', '1.634', {
+        'source_tmpl': 'DBI-1.634.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/T/TI/TIMB'],
+    }),
+    ('DBD::SQLite', '1.48', {
+        'source_tmpl': 'DBD-SQLite-1.48.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/I/IS/ISHIGAKI'],
+    }),
+    ('Math::Bezier', '0.01', {
+        'source_tmpl': 'Math-Bezier-0.01.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/A/AB/ABW'],
+    }),
+    ('Archive::Extract', '0.76', {
+        'source_tmpl': 'Archive-Extract-0.76.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/B/BI/BINGOS'],
+    }),
+    ('DBIx::Simple', '1.35', {
+        'source_tmpl': 'DBIx-Simple-1.35.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/J/JU/JUERD'],
+    }),
+    ('Shell', '0.72', {
+        'source_tmpl': 'Shell-0.72.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/F/FE/FERREIRA'],
+    }),
+    ('File::Spec', '3.47', {
+        'source_tmpl': 'PathTools-3.47.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/S/SM/SMUELLER'],
+    }),
+    ('ExtUtils::MakeMaker', '7.10', {
+        'source_tmpl': 'ExtUtils-MakeMaker-7.10.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/B/BI/BINGOS'],
+    }),
+    ('Test::Simple', '1.001014', {
+        'source_tmpl': 'Test-Simple-1.001014.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/E/EX/EXODIST'],
+    }),
+    ('Set::Scalar', '1.29', {
+        'source_tmpl': 'Set-Scalar-1.29.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/D/DA/DAVIDO'],
+    }),
+    ('IO::WrapTie', '2.111', {
+        'source_tmpl': 'IO-stringy-2.111.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DS/DSKOLL'],
+    }),
+    ('Encode::Locale', '1.05', {
+        'source_tmpl': 'Encode-Locale-1.05.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/G/GA/GAAS'],
+    }),
+    ('XML::SAX::Base', '1.08', {
+        'source_tmpl': 'XML-SAX-Base-1.08.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/G/GR/GRANTM'],
+    }),
+    ('XML::NamespaceSupport', '1.11', {
+        'source_tmpl': 'XML-NamespaceSupport-1.11.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/P/PE/PERIGRIN'],
+    }),
+    ('XML::SAX', '0.99', {
+        'source_tmpl': 'XML-SAX-0.99.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/G/GR/GRANTM'],
+    }),
+    ('Test::LeakTrace', '0.15', {
+        'source_tmpl': 'Test-LeakTrace-0.15.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/G/GF/GFUJI'],
+    }),
+    ('Test::Exception', '0.40', {
+        'source_tmpl': 'Test-Exception-0.40.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/E/EX/EXODIST'],
+    }),
+    ('Text::Table', '1.130', {
+        'source_tmpl': 'Text-Table-1.130.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/S/SH/SHLOMIF'],
+    }),
+    ('MIME::Types', '2.11', {
+        'source_tmpl': 'MIME-Types-2.11.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/M/MA/MARKOV'],
+    }),
+    ('Module::Build::XSUtil', '0.16', {
+        'source_tmpl': 'Module-Build-XSUtil-0.16.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/H/HI/HIDEAKIO'],
+    }),
+    ('Tie::Function', '0.02', {
+        'source_tmpl': 'Tie-Function-0.02.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/D/DA/DAVIDNICO/handy_tied_functions'],
+    }),
+    ('Template::Plugin::Number::Format', '1.06', {
+        'source_tmpl': 'Template-Plugin-Number-Format-1.06.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DA/DARREN'],
+    }),
+    ('HTML::Parser', '3.71', {
+        'source_tmpl': 'HTML-Parser-3.71.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/G/GA/GAAS'],
+    }),
+    ('Date::Handler', '1.2', {
+        'source_tmpl': 'Date-Handler-1.2.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/B/BB/BBEAUSEJ'],
+    }),
+    ('Params::Util', '1.07', {
+        'source_tmpl': 'Params-Util-1.07.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/A/AD/ADAMK'],
+    }),
+    ('IO::HTML', '1.001', {
+        'source_tmpl': 'IO-HTML-1.001.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/C/CJ/CJM'],
+    }),
+    ('Data::Grove', '0.08', {
+        'source_tmpl': 'libxml-perl-0.08.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/K/KM/KMACLEOD'],
+    }),
+    ('Class::ISA', '0.36', {
+        'source_tmpl': 'Class-ISA-0.36.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/S/SM/SMUELLER'],
+    }),
+    ('URI', '1.69', {
+        'source_tmpl': 'URI-1.69.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/E/ET/ETHER'],
+    }),
+    ('Ima::DBI', '0.35', {
+        'source_tmpl': 'Ima-DBI-0.35.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/P/PE/PERRIN'],
+    }),
+    ('Tie::IxHash', '1.23', {
+        'source_tmpl': 'Tie-IxHash-1.23.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/C/CH/CHORNY'],
+    }),
+    ('GO', '0.04', {
+        'source_tmpl': 'go-db-perl-0.04.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/S/SJ/SJCARBON'],
+    }),
+    ('Class::DBI::SQLite', '0.11', {
+        'source_tmpl': 'Class-DBI-SQLite-0.11.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/M/MI/MIYAGAWA'],
+    }),
+    ('Pod::POM', '2.00', {
+        'source_tmpl': 'Pod-POM-2.00.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/N/NE/NEILB'],
+    }),
+    ('Math::Round', '0.07', {
+        'source_tmpl': 'Math-Round-0.07.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/G/GR/GROMMEL'],
+    }),
+    ('Text::Diff', '1.43', {
+        'source_tmpl': 'Text-Diff-1.43.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/N/NE/NEILB'],
+    }),
+    ('Log::Message::Simple', '0.10', {
+        'source_tmpl': 'Log-Message-Simple-0.10.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/B/BI/BINGOS'],
+    }),
+    ('IO::Socket::SSL', '2.020', {
+        'source_tmpl': 'IO-Socket-SSL-2.020.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/S/SU/SULLR'],
+    }),
+    ('Fennec::Lite', '0.004', {
+        'source_tmpl': 'Fennec-Lite-0.004.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/E/EX/EXODIST'],
+    }),
+    ('Sub::Uplevel', '0.25', {
+        'source_tmpl': 'Sub-Uplevel-0.25.tar.gz',
+        'source_urls': ['http://search.cpan.org/CPAN/authors/id/D/DA/DAGOLDEN/'],
+    }),
+    ('Meta::Builder', '0.003', {
+        'source_tmpl': 'Meta-Builder-0.003.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/E/EX/EXODIST'],
+    }),
+    ('Exporter::Declare', '0.114', {
+        'source_tmpl': 'Exporter-Declare-0.114.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/E/EX/EXODIST'],
+    }),
+    ('IO::Stringy', '2.111', {
+        'source_tmpl': 'IO-stringy-2.111.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DS/DSKOLL'],
+    }),
+    ('Getopt::Long', '2.47', {
+        'source_tmpl': 'Getopt-Long-2.47.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/J/JV/JV'],
+    }),
+    ('Log::Message', '0.08', {
+        'source_tmpl': 'Log-Message-0.08.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/B/BI/BINGOS'],
+    }),
+    ('Mouse', 'v2.4.5', {
+        'source_tmpl': 'Mouse-v2.4.5.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/S/SY/SYOHEX'],
+    }),
+    ('Test::Version', '2.03', {
+        'source_tmpl': 'Test-Version-2.03.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/P/PL/PLICEASE'],
+    }),
+    ('DBIx::Admin::TableInfo', '3.01', {
+        'source_tmpl': 'DBIx-Admin-TableInfo-3.01.tgz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RS/RSAVAGE'],
+    }),
+    ('Net::HTTP', '6.09', {
+        'source_tmpl': 'Net-HTTP-6.09.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/E/ET/ETHER'],
+    }),
+    ('Test::Deep', '0.117', {
+        'source_tmpl': 'Test-Deep-0.117.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RJ/RJBS'],
+    }),
+    ('Test::Warn', '0.30', {
+        'source_tmpl': 'Test-Warn-0.30.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/C/CH/CHORNY'],
+    }),
+    ('MRO::Compat', '0.12', {
+        'source_tmpl': 'MRO-Compat-0.12.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/B/BO/BOBTFISH'],
+    }),
+    ('Moo', '2.000002', {
+        'source_tmpl': 'Moo-2.000002.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/H/HA/HAARG'],
+    }),
+    ('Hash::Merge', '0.200', {
+        'source_urls': ['http://search.cpan.org/CPAN/authors/id/R/RE/REHSACK/'],
+        'source_tmpl': 'Hash-Merge-0.200.tar.gz',
+    }),
+    ('SQL::Abstract', '1.81', {
+        'source_tmpl': 'SQL-Abstract-1.81.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RI/RIBASUSHI'],
+    }),
+    ('HTML::Form', '6.03', {
+        'source_tmpl': 'HTML-Form-6.03.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/G/GA/GAAS'],
+    }),
+    ('File::Copy::Recursive', '0.38', {
+        'source_tmpl': 'File-Copy-Recursive-0.38.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/D/DM/DMUEY'],
+    }),
+    ('Number::Compare', '0.03', {
+        'source_tmpl': 'Number-Compare-0.03.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/R/RC/RCLAMP'],
+    }),
+    ('IPC::Run', '0.94', {
+        'source_tmpl': 'IPC-Run-0.94.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/T/TO/TODDR'],
+    }),
+    ('HTML::Entities::Interpolate', '1.05', {
+        'source_tmpl': 'HTML-Entities-Interpolate-1.05.tgz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/R/RS/RSAVAGE'],
+    }),
+    ('Test::ClassAPI', '1.06', {
+        'source_tmpl': 'Test-ClassAPI-1.06.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/A/AD/ADAMK'],
+    }),
+    ('Test::Most', '0.34', {
+        'source_tmpl': 'Test-Most-0.34.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/O/OV/OVID'],
+    }),
+    ('Class::Accessor', '0.34', {
+        'source_tmpl': 'Class-Accessor-0.34.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/K/KA/KASEI'],
+    }),
+    ('Test::Differences', '0.63', {
+        'source_tmpl': 'Test-Differences-0.63.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DC/DCANTRELL'],
+    }),
+    ('HTTP::Tiny', '0.056', {
+        'source_tmpl': 'HTTP-Tiny-0.056.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DA/DAGOLDEN'],
+    }),
+    ('Package::DeprecationManager', '0.14', {
+        'source_tmpl': 'Package-DeprecationManager-0.14.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DR/DROLSKY'],
+    }),
+    ('Digest::SHA1', '2.13', {
+        'source_tmpl': 'Digest-SHA1-2.13.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/G/GA/GAAS'],
+    }),
+    ('Date::Language', '2.30', {
+        'source_tmpl': 'TimeDate-2.30.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/G/GB/GBARR'],
+    }),
+    ('version', '0.9912', {
+        'source_tmpl': 'version-0.9912.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/J/JP/JPEACOCK'],
+    }),
+    ('Sub::Uplevel', '0.25', {
+        'source_tmpl': 'Sub-Uplevel-0.25.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DA/DAGOLDEN'],
+    }),
+    # fails: uses 'gcc'
+    #('XML::Bare', '0.53', {
+    #    'source_tmpl': 'XML-Bare-0.53.tar.gz',
+    #    'source_urls': ['http://cpan.metacpan.org/authors/id/C/CO/CODECHILD'],
+    #}),
+    ('Dist::CheckConflicts', '0.11', {
+        'source_tmpl': 'Dist-CheckConflicts-0.11.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/D/DO/DOY'],
+    }),
+    ('Sub::Name', '0.14', {
+        'source_tmpl': 'Sub-Name-0.14.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/E/ET/ETHER'],
+    }),
+    ('Time::Piece', '1.30', {
+        'source_tmpl': 'Time-Piece-1.30.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RJ/RJBS'],
+    }),
+    ('Digest::HMAC', '1.03', {
+        'source_tmpl': 'Digest-HMAC-1.03.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/G/GA/GAAS'],
+    }),
+    ('HTTP::Negotiate', '6.01', {
+        'source_tmpl': 'HTTP-Negotiate-6.01.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/G/GA/GAAS'],
+    }),
+    ('MIME::Lite', '3.030', {
+        'source_tmpl': 'MIME-Lite-3.030.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/R/RJ/RJBS'],
+    }),
+    ('Crypt::Rijndael', '1.13', {
+        'source_tmpl': 'Crypt-Rijndael-1.13.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/L/LE/LEONT'],
+    }),
+    ('B::Lint', '1.20', {
+        'source_tmpl': 'B-Lint-1.20.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RJ/RJBS'],
+    }),
+    ('Canary::Stability', '2006', {
+        'source_tmpl': 'Canary-Stability-2006.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/M/ML/MLEHMANN'],
+    }),
+    ('AnyEvent', '7.11', {
+        'source_tmpl': 'AnyEvent-7.11.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/M/ML/MLEHMANN'],
+    }),
+    ('Object::Accessor', '0.48', {
+        'source_tmpl': 'Object-Accessor-0.48.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/B/BI/BINGOS'],
+    }),
+    ('Data::UUID', '1.221', {
+        'source_tmpl': 'Data-UUID-1.221.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RJ/RJBS'],
+    }),
+    ('Test::Pod', '1.51', {
+        'source_tmpl': 'Test-Pod-1.51.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/E/ET/ETHER'],
+    }),
+    ('AppConfig', '1.71', {
+        'source_tmpl': 'AppConfig-1.71.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/N/NE/NEILB'],
+    }),
+    ('Net::SMTP::SSL', '1.03', {
+        'source_tmpl': 'Net-SMTP-SSL-1.03.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RJ/RJBS'],
+    }),
+    ('XML::Tiny', '2.06', {
+        'source_tmpl': 'XML-Tiny-2.06.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/D/DC/DCANTRELL'],
+    }),
+    ('HTML::Tagset', '3.20', {
+        'source_tmpl': 'HTML-Tagset-3.20.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/P/PE/PETDANCE'],
+    }),
+    ('HTML::Tree', '5.03', {
+        'source_tmpl': 'HTML-Tree-5.03.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/C/CJ/CJM'],
+    }),
+    ('Devel::GlobalDestruction', '0.13', {
+        'source_tmpl': 'Devel-GlobalDestruction-0.13.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/H/HA/HAARG'],
+    }),
+    ('WWW::RobotRules', '6.02', {
+        'source_tmpl': 'WWW-RobotRules-6.02.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/G/GA/GAAS'],
+    }),
+    ('Expect', '1.32', {
+        'source_tmpl': 'Expect-1.32.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/S/SZ/SZABGAB'],
+    }),
+    ('Term::UI', '0.46', {
+        'source_tmpl': 'Term-UI-0.46.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/B/BI/BINGOS'],
+    }),
+    ('Net::SNMP', 'v6.0.1', {
+        'source_tmpl': 'Net-SNMP-v6.0.1.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/D/DT/DTOWN'],
+    }),
+    ('XML::SAX::Writer', '0.56', {
+        'source_tmpl': 'XML-SAX-Writer-0.56.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/P/PE/PERIGRIN'],
+    }),
+    ('Statistics::Descriptive', '3.0609', {
+        'source_tmpl': 'Statistics-Descriptive-3.0609.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/S/SH/SHLOMIF'],
+    }),
+    ('Class::Load', '0.23', {
+        'source_tmpl': 'Class-Load-0.23.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/E/ET/ETHER'],
+    }),
+    ('LWP::Simple', '6.13', {
+        'source_tmpl': 'libwww-perl-6.13.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/E/ET/ETHER'],
+    }),
+    ('Time::Piece::MySQL', '0.06', {
+        'source_tmpl': 'Time-Piece-MySQL-0.06.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/K/KA/KASEI'],
+    }),
+    ('Package::Stash::XS', '0.28', {
+        'source_tmpl': 'Package-Stash-XS-0.28.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/D/DO/DOY'],
+    }),
+    ('GD::Graph', '1.49', {
+        'source_tmpl': 'GDGraph-1.49.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RU/RUZ'],
+    }),
+    ('Set::Array', '0.30', {
+        'source_tmpl': 'Set-Array-0.30.tgz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/R/RS/RSAVAGE'],
+    }),
+    ('boolean', '0.45', {
+        'source_tmpl': 'boolean-0.45.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/I/IN/INGY'],
+    }),
+    ('Number::Format', '1.75', {
+        'source_tmpl': 'Number-Format-1.75.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/W/WR/WRW'],
+    }),
+    ('Data::Stag', '0.14', {
+        'source_tmpl': 'Data-Stag-0.14.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/C/CM/CMUNGALL'],
+    }),
+    ('Test::Tester', '1.001014', {
+        'source_tmpl': 'Test-Simple-1.001014.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/E/EX/EXODIST'],
+    }),
+    ('Test::NoWarnings', '1.04', {
+        'source_tmpl': 'Test-NoWarnings-1.04.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/A/AD/ADAMK'],
+    }),
+    ('Crypt::DES', '2.07', {
+        'source_tmpl': 'Crypt-DES-2.07.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/D/DP/DPARIS'],
+    }),
+    ('Exporter', '5.72', {
+        'source_tmpl': 'Exporter-5.72.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/T/TO/TODDR'],
+    }),
+    ('Class::Inspector', '1.28', {
+        'source_tmpl': 'Class-Inspector-1.28.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/A/AD/ADAMK'],
+    }),
+    ('Parse::RecDescent', '1.967012', {
+        'source_tmpl': 'Parse-RecDescent-1.967012.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/J/JT/JTBRAUN'],
+    }),
+    ('Carp', '1.36', {
+        'source_tmpl': 'Carp-1.36.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RJ/RJBS'],
+    }),
+    ('XML::XPath', '1.13', {
+        'source_tmpl': 'XML-XPath-1.13.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/M/MS/MSERGEANT'],
+    }),
+    ('Capture::Tiny', '0.30', {
+        'source_tmpl': 'Capture-Tiny-0.30.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DA/DAGOLDEN'],
+    }),
+    ('JSON', '2.90', {
+        'source_tmpl': 'JSON-2.90.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/M/MA/MAKAMAKA'],
+    }),
+    ('Sub::Exporter', '0.987', {
+        'source_tmpl': 'Sub-Exporter-0.987.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/R/RJ/RJBS'],
+    }),
+    ('Class::Load::XS', '0.09', {
+        'source_tmpl': 'Class-Load-XS-0.09.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/E/ET/ETHER'],
+    }),
+    ('Set::IntSpan::Fast', '1.15', {
+        'source_tmpl': 'Set-IntSpan-Fast-1.15.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/A/AN/ANDYA'],
+    }),
+    ('Sub::Exporter::Progressive', '0.001011', {
+        'source_tmpl': 'Sub-Exporter-Progressive-0.001011.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/F/FR/FREW'],
+    }),
+    ('LWP', '6.13', {
+        'source_tmpl': 'libwww-perl-6.13.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/E/ET/ETHER'],
+    }),
+    ('Data::Dumper::Concise', '2.022', {
+        'source_tmpl': 'Data-Dumper-Concise-2.022.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/F/FR/FREW'],
+    }),
+    ('File::Slurp::Tiny', '0.004', {
+        'source_tmpl': 'File-Slurp-Tiny-0.004.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/L/LE/LEONT'],
+    }),
+    ('Algorithm::Diff', '1.1903', {
+        'source_tmpl': 'Algorithm-Diff-1.1903.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/T/TY/TYEMQ'],
+    }),
+    ('AnyData', '0.12', {
+        'source_tmpl': 'AnyData-0.12.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RE/REHSACK'],
+    }),
+    ('Text::Iconv', '1.7', {
+        'source_tmpl': 'Text-Iconv-1.7.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/M/MP/MPIOTR'],
+    }),
+    ('Class::Data::Inheritable', '0.08', {
+        'source_tmpl': 'Class-Data-Inheritable-0.08.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/T/TM/TMTM'],
+    }),
+    ('Text::Balanced', '2.03', {
+        'source_tmpl': 'Text-Balanced-2.03.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/S/SH/SHAY'],
+    }),
+    ('strictures', '2.000001', {
+        'source_tmpl': 'strictures-2.000001.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/H/HA/HAARG'],
+    }),
+    ('Switch', '2.17', {
+        'source_tmpl': 'Switch-2.17.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/C/CH/CHORNY'],
+    }),
+    ('File::Which', '1.19', {
+        'source_tmpl': 'File-Which-1.19.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/P/PL/PLICEASE'],
+    }),
+    ('Email::Date::Format', '1.005', {
+        'source_tmpl': 'Email-Date-Format-1.005.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/R/RJ/RJBS'],
+    }),
+    ('Error', '0.17024', {
+        'source_tmpl': 'Error-0.17024.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/S/SH/SHLOMIF'],
+    }),
+    ('Mock::Quick', '1.110', {
+        'source_tmpl': 'Mock-Quick-1.110.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/E/EX/EXODIST'],
+    }),
+    ('Text::CSV', '1.33', {
+        'source_tmpl': 'Text-CSV-1.33.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/M/MA/MAKAMAKA'],
+    }),
+    ('Test::Output', '1.03', {
+        'source_tmpl': 'Test-Output-1.03.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/B/BD/BDFOY'],
+    }),
+    ('Class::DBI', 'v3.0.17', {
+        'source_tmpl': 'Class-DBI-v3.0.17.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/T/TM/TMTM'],
+    }),
+    ('List::AllUtils', '0.09', {
+        'source_tmpl': 'List-AllUtils-0.09.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/D/DR/DROLSKY'],
+    }),
+    ('UNIVERSAL::moniker', '0.08', {
+        'source_tmpl': 'UNIVERSAL-moniker-0.08.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/K/KA/KASEI'],
+    }),
+    ('Exception::Class', '1.39', {
+        'source_tmpl': 'Exception-Class-1.39.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DR/DROLSKY'],
+    }),
+    ('File::CheckTree', '4.42', {
+        'source_tmpl': 'File-CheckTree-4.42.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/R/RJ/RJBS'],
+    }),
+    ('Math::VecStat', '0.08', {
+        'source_tmpl': 'Math-VecStat-0.08.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/A/AS/ASPINELLI'],
+    }),
+    ('Pod::LaTeX', '0.61', {
+        'source_tmpl': 'Pod-LaTeX-0.61.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/T/TJ/TJENNESS'],
+    }),
+    ('Eval::Closure', '0.13', {
+        'source_tmpl': 'Eval-Closure-0.13.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DO/DOY'],
+    }),
+    ('HTTP::Request', '6.11', {
+        'source_tmpl': 'HTTP-Message-6.11.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/E/ET/ETHER'],
+    }),
+    ('XML::Twig', '3.49', {
+        'source_tmpl': 'XML-Twig-3.49.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/M/MI/MIROD'],
+    }),
+    ('IO::String', '1.08', {
+        'source_tmpl': 'IO-String-1.08.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/G/GA/GAAS'],
+    }),
+    ('XML::Simple', '2.20', {
+        'source_tmpl': 'XML-Simple-2.20.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/G/GR/GRANTM'],
+    }),
+    ('Sub::Install', '0.928', {
+        'source_tmpl': 'Sub-Install-0.928.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/R/RJ/RJBS'],
+    }),
+    ('HTTP::Cookies', '6.01', {
+        'source_tmpl': 'HTTP-Cookies-6.01.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/G/GA/GAAS'],
+    }),
+    ('Pod::Plainer', '1.04', {
+        'source_tmpl': 'Pod-Plainer-1.04.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/R/RM/RMBARKER'],
+    }),
+    ('Test::Exception::LessClever', '0.006', {
+        'source_tmpl': 'Test-Exception-LessClever-0.006.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/E/EX/EXODIST'],
+    }),
+    ('LWP::MediaTypes', '6.02', {
+        'source_tmpl': 'LWP-MediaTypes-6.02.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/G/GA/GAAS'],
+    }),
+    ('Scalar::Util', '1.42', {
+        'source_tmpl': 'Scalar-List-Utils-1.42.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/P/PE/PEVANS'],
+    }),
+    ('Data::Section::Simple', '0.07', {
+        'source_tmpl': 'Data-Section-Simple-0.07.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/M/MI/MIYAGAWA'],
+    }),
+    ('IO::Scalar', '2.111', {
+        'source_tmpl': 'IO-stringy-2.111.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DS/DSKOLL'],
+    }),
+    ('Class::Trigger', '0.14', {
+        'source_tmpl': 'Class-Trigger-0.14.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/M/MI/MIYAGAWA'],
+    }),
+    ('HTTP::Daemon', '6.01', {
+        'source_tmpl': 'HTTP-Daemon-6.01.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/G/GA/GAAS'],
+    }),
+    ('File::HomeDir', '1.00', {
+        'source_tmpl': 'File-HomeDir-1.00.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/A/AD/ADAMK'],
+    }),
+    ('HTTP::Date', '6.02', {
+        'source_tmpl': 'HTTP-Date-6.02.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/G/GA/GAAS'],
+    }),
+    ('Authen::SASL', '2.16', {
+        'source_tmpl': 'Authen-SASL-2.16.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/G/GB/GBARR'],
+    }),
+    ('Clone', '0.38', {
+        'source_tmpl': 'Clone-0.38.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/G/GA/GARU'],
+    }),
+    ('Data::Types', '0.09', {
+        'source_tmpl': 'Data-Types-0.09.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/D/DW/DWHEELER'],
+    }),
+    ('Import::Into', '1.002005', {
+        'source_tmpl': 'Import-Into-1.002005.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/H/HA/HAARG'],
+    }),
+    ('DateTime::Tiny', '1.04', {
+        'source_tmpl': 'DateTime-Tiny-1.04.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/A/AD/ADAMK'],
+    }),
+    ('DBD::AnyData', '0.110', {
+        'source_tmpl': 'DBD-AnyData-0.110.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/R/RE/REHSACK'],
+    }),
+    ('Text::Format', '0.59', {
+        'source_tmpl': 'Text-Format-0.59.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/S/SH/SHLOMIF'],
+    }),
+    ('Devel::CheckCompiler', '0.06', {
+        'source_tmpl': 'Devel-CheckCompiler-0.06.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/S/SY/SYOHEX'],
+    }),
+    ('Log::Handler', '0.87', {
+        'source_tmpl': 'Log-Handler-0.87.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/B/BL/BLOONIX'],
+    }),
+    ('DBIx::ContextualFetch', '1.03', {
+        'source_tmpl': 'DBIx-ContextualFetch-1.03.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/T/TM/TMTM'],
+    }),
+    ('HTML::Entities', '3.71', {
+        'source_tmpl': 'HTML-Parser-3.71.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/G/GA/GAAS'],
+    }),
+    ('Devel::StackTrace', '2.00', {
+        'source_tmpl': 'Devel-StackTrace-2.00.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DR/DROLSKY'],
+    }),
+    ('Term::ReadKey', '2.33', {
+        'source_tmpl': 'TermReadKey-2.33.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/J/JS/JSTOWE'],
+    }),
+    ('Set::IntSpan', '1.19', {
+        'source_tmpl': 'Set-IntSpan-1.19.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/S/SW/SWMCD'],
+    }),
+    ('Moose', '2.1603', {
+        'source_tmpl': 'Moose-2.1603.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/E/ET/ETHER'],
+    }),
+    ('Algorithm::Dependency', '1.110', {
+        'source_tmpl': 'Algorithm-Dependency-1.110.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/A/AD/ADAMK'],
+    }),
+    ('Font::TTF', '1.05', {
+        'source_tmpl': 'Font-TTF-1.05.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/M/MH/MHOSKEN'],
+    }),
+    ('IPC::Run3', '0.048', {
+        'source_tmpl': 'IPC-Run3-0.048.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/R/RJ/RJBS'],
+    }),
+    ('File::Find::Rule', '0.33', {
+        'source_tmpl': 'File-Find-Rule-0.33.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/R/RC/RCLAMP'],
+    }),
+    ('SQL::Statement', '1.407', {
+        'source_tmpl': 'SQL-Statement-1.407.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RE/REHSACK'],
+    }),
+    ('File::Slurp', '9999.19', {
+        'source_tmpl': 'File-Slurp-9999.19.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/U/UR/URI'],
+    }),
+    ('Package::Stash', '0.37', {
+        'source_tmpl': 'Package-Stash-0.37.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/D/DO/DOY'],
+    }),
+    ('Data::OptList', '0.109', {
+        'source_tmpl': 'Data-OptList-0.109.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/R/RJ/RJBS'],
+    }),
+    ('CPANPLUS', '0.9154', {
+        'source_tmpl': 'CPANPLUS-0.9154.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/B/BI/BINGOS'],
+    }),
+    ('Test::Harness', '3.35', {
+        'source_tmpl': 'Test-Harness-3.35.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/L/LE/LEONT'],
+    }),
+    ('IO::Tty', '1.12', {
+        'source_tmpl': 'IO-Tty-1.12.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/T/TO/TODDR'],
+    }),
+    ('Text::Soundex', '3.04', {
+        'source_tmpl': 'Text-Soundex-3.04.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/R/RJ/RJBS'],
+    }),
+    ('Lingua::EN::PluralToSingular', '0.14', {
+        'source_tmpl': 'Lingua-EN-PluralToSingular-0.14.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/B/BK/BKB'],
+    }),
+    ('Want', '0.26', {
+        'source_tmpl': 'Want-0.26.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RO/ROBIN'],
+    }),
+    ('Cwd::Guard', '0.04', {
+        'source_tmpl': 'Cwd-Guard-0.04.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/K/KA/KAZEBURO'],
+    }),
+    ('Bundle::BioPerl', '2.1.9', {
+        'source_tmpl': 'Bundle-BioPerl-2.1.9.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/C/CJ/CJFIELDS'],
+    }),
+    ('Mail::Util', '2.14', {
+        'source_tmpl': 'MailTools-2.14.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/M/MA/MARKOV'],
+    }),
+]
+
+moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/p/Perl/Perl-5.22.1-intel-2016a-bare.eb b/easybuild/easyconfigs/p/Perl/Perl-5.22.1-intel-2016a-bare.eb
new file mode 100644
index 0000000000000000000000000000000000000000..2796d0fc7f90e9f036b6a52de8f8cc9e86cf13b2
--- /dev/null
+++ b/easybuild/easyconfigs/p/Perl/Perl-5.22.1-intel-2016a-bare.eb
@@ -0,0 +1,17 @@
+name = 'Perl'
+version = '5.22.1'
+versionsuffix = '-bare'
+
+homepage = 'http://www.perl.org/'
+description = """Larry Wall's Practical Extraction and Report Language"""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+toolchainopts = {'optarch': True, 'pic': True}
+
+source_urls = ['http://www.cpan.org/src/%(version_major)s.0']
+sources = [SOURCELOWER_TAR_GZ]
+
+# bare, no extensions
+exts_list = []
+
+moduleclass = 'lang'
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 864b80e95ce978be20bfe79b08fd5f4979153b1e..bca12c0034c692c32615cf608fe8627e57d02486 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
@@ -31,12 +31,12 @@ cmds_map = [('.*', "CPATH=$EBROOTSAMTOOLS/include/bam:$CPATH ./INSTALL $EBROOTSA
 
 files_to_copy = [
     (['pindel', 'sam2pindel', 'pindel2vcf', 'bam2pindel.pl', 'Adaptor.pm'], 'bin'),
-     "demo",
-     "gmt",
-     "gmt-web",
-     "test",
-     "README.md",
-     "RELEASE"
+    "demo",
+    "gmt",
+    "gmt-web",
+    "test",
+    "README.md",
+    "RELEASE"
 ]
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/p/PnMPI/PnMPI-1.2.0-gompi-1.4.12-no-OFED.eb b/easybuild/easyconfigs/p/PnMPI/PnMPI-1.2.0-gompi-1.4.12-no-OFED.eb
index 3b3f47bdf1613b7764596b5ed549ae5d820485eb..909fa6783b37ef85093457ae3a34603a493e588f 100644
--- a/easybuild/easyconfigs/p/PnMPI/PnMPI-1.2.0-gompi-1.4.12-no-OFED.eb
+++ b/easybuild/easyconfigs/p/PnMPI/PnMPI-1.2.0-gompi-1.4.12-no-OFED.eb
@@ -23,7 +23,7 @@ sources = ['%(namelower)s-for-gti-%(version)s.tar.gz']
 
 builddependencies = [('CMake', '2.8.10.2')]
 
-configopts  = ' -DCMAKE_BUILD_TYPE=Release -DBFD_FOUND=False -DPNMPI_HAVE_BFD=False'
+configopts = ' -DCMAKE_BUILD_TYPE=Release -DBFD_FOUND=False -DPNMPI_HAVE_BFD=False'
 
 parallel = 1
 
diff --git a/easybuild/easyconfigs/p/PostgreSQL/PostgreSQL-9.3.5-intel-2014b.eb b/easybuild/easyconfigs/p/PostgreSQL/PostgreSQL-9.3.5-intel-2014b.eb
index f0f5501b846be81899908f970ee1dec54dd300a7..815c947eaca508729f927c5c81487b4561ec6363 100644
--- a/easybuild/easyconfigs/p/PostgreSQL/PostgreSQL-9.3.5-intel-2014b.eb
+++ b/easybuild/easyconfigs/p/PostgreSQL/PostgreSQL-9.3.5-intel-2014b.eb
@@ -27,7 +27,7 @@ dependencies = [
     (java, javaver, '', True),
     ('libreadline', '6.3'),
     ('zlib', '1.2.8'),
-#    ('OpenSSL', '1.0.1i'), # OS dependency should be preferred for security reasons
+    #    ('OpenSSL', '1.0.1i'), # OS dependency should be preferred for security reasons
 ]
 
 builddependencies = [
diff --git a/easybuild/easyconfigs/p/pycairo/pycairo-1.10.0-intel-2015b-Python-2.7.10.eb b/easybuild/easyconfigs/p/PyCairo/PyCairo-1.10.0-intel-2015b-Python-2.7.10.eb
similarity index 97%
rename from easybuild/easyconfigs/p/pycairo/pycairo-1.10.0-intel-2015b-Python-2.7.10.eb
rename to easybuild/easyconfigs/p/PyCairo/PyCairo-1.10.0-intel-2015b-Python-2.7.10.eb
index f701cf3d28dc4380f0406fb61d6802dbbf0952b1..246a64686dcbb9cbf44af3aa28009424d391866b 100644
--- a/easybuild/easyconfigs/p/pycairo/pycairo-1.10.0-intel-2015b-Python-2.7.10.eb
+++ b/easybuild/easyconfigs/p/PyCairo/PyCairo-1.10.0-intel-2015b-Python-2.7.10.eb
@@ -1,6 +1,6 @@
 easyblock = 'Waf'
 
-name = 'pycairo'
+name = 'PyCairo'
 version = '1.10.0'
 
 homepage = 'http://cairographics.org/pycairo/'
diff --git a/easybuild/easyconfigs/p/PyCairo/PyCairo-1.10.0-intel-2016a-Python-2.7.11.eb b/easybuild/easyconfigs/p/PyCairo/PyCairo-1.10.0-intel-2016a-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..27c3b183913060540a38d916cc638123a839b252
--- /dev/null
+++ b/easybuild/easyconfigs/p/PyCairo/PyCairo-1.10.0-intel-2016a-Python-2.7.11.eb
@@ -0,0 +1,35 @@
+easyblock = 'Waf'
+
+name = 'PyCairo'
+version = '1.10.0'
+
+homepage = 'http://cairographics.org/pycairo/'
+description = """Python bindings for the cairo library"""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+source_urls = ['http://cairographics.org/releases/']
+# py2cairo is the Python 2 compatible release
+sources = ['py2cairo-%(version)s.tar.bz2']
+
+pyver = '2.7.11'
+pyshortver = '.'.join(pyver.split('.')[:2])
+versionsuffix = '-Python-%s' % pyver
+
+configopts = " --nopyc --nopyo "
+
+dependencies = [
+    ('Python', pyver),
+    ('cairo', '1.14.6'),
+]
+
+modextrapaths = {
+    'PYTHONPATH': ['lib/python%s/site-packages' % pyshortver, 'lib64/python%s/site-packages' % pyshortver],
+}
+
+sanity_check_paths = {
+    'files': ['include/pycairo/pycairo.h', 'lib/pkgconfig/pycairo.pc'],
+    'dirs': ['lib/python%s/site-packages/cairo' % pyshortver],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/p/PyFFmpeg/PyFFmpeg-2.1beta-gimkl-2.11.5-Python-2.7.10.eb b/easybuild/easyconfigs/p/PyFFmpeg/PyFFmpeg-2.1beta-gimkl-2.11.5-Python-2.7.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..3f9ec175b06862c9d335ff4e514baeb94f68324b
--- /dev/null
+++ b/easybuild/easyconfigs/p/PyFFmpeg/PyFFmpeg-2.1beta-gimkl-2.11.5-Python-2.7.10.eb
@@ -0,0 +1,34 @@
+easyblock = 'PythonPackage'
+
+name = 'PyFFmpeg'
+version = '2.1beta'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'https://github.com/mhaller/pyffmpeg'
+description = """Python FFmpeg wrapper"""
+
+toolchain = {'name': 'gimkl', 'version': '2.11.5'}
+toolchainopts = {'usempi': True}
+
+source_urls = ['https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/pyffmpeg/']
+sources = [SOURCELOWER_TAR_GZ]
+
+patches = [
+    'PyFFmpeg-%(version)s_ffmpegpath.patch',
+    'PyFFmpeg-%(version)s_Cython-fixes.patch',
+]
+
+dependencies = [
+    ('Python', '2.7.10'),
+    ('Cython', '0.23.4', versionsuffix),
+    ('FFmpeg', '0.10.16'),
+]
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%(pyshortver)s/site-packages/'],
+}
+
+options = {'modulename': '%(namelower)s'}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/p/PyFFmpeg/PyFFmpeg-2.1beta-intel-2016a-Python-2.7.11.eb b/easybuild/easyconfigs/p/PyFFmpeg/PyFFmpeg-2.1beta-intel-2016a-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..f4ffc868166bde8ae216f7b99e474005dacbab99
--- /dev/null
+++ b/easybuild/easyconfigs/p/PyFFmpeg/PyFFmpeg-2.1beta-intel-2016a-Python-2.7.11.eb
@@ -0,0 +1,33 @@
+easyblock = 'PythonPackage'
+
+name = 'PyFFmpeg'
+version = '2.1beta'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'https://github.com/mhaller/pyffmpeg'
+description = """Python FFmpeg wrapper"""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+toolchainopts = {'usempi': True}
+
+source_urls = ['https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/pyffmpeg/']
+sources = [SOURCELOWER_TAR_GZ]
+
+patches = [
+    'PyFFmpeg-%(version)s_ffmpegpath.patch',
+    'PyFFmpeg-%(version)s_Cython-fixes.patch',
+]
+
+dependencies = [
+    ('Python', '2.7.11'),
+    ('FFmpeg', '0.10.16'),
+]
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%(pyshortver)s/site-packages/'],
+}
+
+options = {'modulename': '%(namelower)s'}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/p/PyFFmpeg/PyFFmpeg-2.1beta_Cython-fixes.patch b/easybuild/easyconfigs/p/PyFFmpeg/PyFFmpeg-2.1beta_Cython-fixes.patch
new file mode 100644
index 0000000000000000000000000000000000000000..4370508444ed637e71aa37808632fa77d0d31e28
--- /dev/null
+++ b/easybuild/easyconfigs/p/PyFFmpeg/PyFFmpeg-2.1beta_Cython-fixes.patch
@@ -0,0 +1,201 @@
+fix compilation issues, cfr. https://code.google.com/archive/p/pyffmpeg/issues/44
+author: Kenneth Hoste (HPC-UGent)
+--- pyffmpeg-2.1beta/pyffmpeg.pyx.orig	2011-01-12 16:49:19.000000000 +0100
++++ pyffmpeg-2.1beta/pyffmpeg.pyx	2016-02-17 14:09:02.007382083 +0100
+@@ -183,7 +183,6 @@
+ #        int height
+ #        int pix_fmt
+ #        int frame_number
+-#        int hurry_up
+ #        int skip_idct
+ #        int skip_frame
+ 
+@@ -220,7 +219,6 @@
+         float     b_quant_factor
+         int     rc_strategy
+         int     b_frame_strategy
+-        int     hurry_up
+         int     rtp_mode
+         int     rtp_payload_size
+         int     mv_bits
+@@ -370,12 +368,12 @@
+         int skip_loop_filter
+ 
+ 
+-    enum CodecType:
+-        CODEC_TYPE_UNKNOWN = -1
+-        CODEC_TYPE_VIDEO = 0
+-        CODEC_TYPE_AUDIO = 1
+-        CODEC_TYPE_DATA = 2
+-        CODEC_TYPE_SUBTITLE = 3
++    enum AVMediaType:
++        AVMEDIA_TYPE_UNKNOWN = -1
++        AVMEDIA_TYPE_VIDEO = 0
++        AVMEDIA_TYPE_AUDIO = 1
++        AVMEDIA_TYPE_DATA = 2
++        AVMEDIA_TYPE_SUBTITLE = 3
+ 
+     struct AVCodec:
+         char *name
+@@ -620,7 +618,7 @@
+     AVInputFormat *av_probe_input_format(AVProbeData *pd, int is_opened)
+     AVInputFormat *av_probe_input_format2(AVProbeData *pd, int is_opened,int * score)
+     AVFormatContext *  avformat_alloc_context()
+-    AVOutputFormat *guess_format(char *short_name, char *filename,char *mime_type)
++    AVOutputFormat *av_guess_format(char *short_name, char *filename,char *mime_type)
+ 
+ cdef __registered
+ __registered = 0
+@@ -703,6 +701,7 @@
+ 
+ 
+ def py_av_register_all():
++    global __registered
+     if __registered:
+         return
+     __registered = 1
+@@ -761,10 +760,10 @@
+ ###############################################################################
+ ## Some common settings
+ ###############################################################################
+-TS_AUDIOVIDEO={'video1':(CODEC_TYPE_VIDEO, -1,  {}), 'audio1':(CODEC_TYPE_AUDIO, -1, {})}
+-TS_AUDIO={ 'audio1':(CODEC_TYPE_AUDIO, -1, {})}
+-TS_VIDEO={ 'video1':(CODEC_TYPE_VIDEO, -1, {})}
+-TS_VIDEO_PIL={ 'video1':(CODEC_TYPE_VIDEO, -1, {'outputmode':OUTPUTMODE_PIL})}
++TS_AUDIOVIDEO={'video1':(AVMEDIA_TYPE_VIDEO, -1,  {}), 'audio1':(AVMEDIA_TYPE_AUDIO, -1, {})}
++TS_AUDIO={ 'audio1':(AVMEDIA_TYPE_AUDIO, -1, {})}
++TS_VIDEO={ 'video1':(AVMEDIA_TYPE_VIDEO, -1, {})}
++TS_VIDEO_PIL={ 'video1':(AVMEDIA_TYPE_VIDEO, -1, {'outputmode':OUTPUTMODE_PIL})}
+ 
+ 
+ 
+@@ -805,13 +804,13 @@
+  #   self.prepacket=<AVPacket *>None
+ #   self.packet=&self.packetbufa
+ 
+-    def __new__(self):
++    def __cinit__(self):
+         pass
+ 
+     def dump(self):
+         pass
+ 
+-    def open(self,char *filename, track_selector={'video1':(CODEC_TYPE_VIDEO, -1), 'audio1':(CODEC_TYPE_AUDIO, -1)}):
++    def open(self,char *filename, track_selector={'video1':(AVMEDIA_TYPE_VIDEO, -1), 'audio1':(AVMEDIA_TYPE_AUDIO, -1)}):
+         pass
+ 
+     def close(self):
+@@ -906,7 +905,6 @@
+             skip_frame
+             skip_idct
+             skip_loop_filter
+-            hurry_up
+             dct_algo
+             idct_algo
+ 
+@@ -916,7 +914,7 @@
+         self.observer=None
+         self.support_truncated=support_truncated
+         for k in args.keys():
+-            if k not in [ "skip_frame", "skip_loop_filter", "skip_idct", "hurry_up", "hurry_mode", "dct_algo", "idct_algo", "check_start" ,"check_end"]:
++            if k not in [ "skip_frame", "skip_loop_filter", "skip_idct", "hurry_mode", "dct_algo", "idct_algo", "check_start" ,"check_end"]:
+                 sys.stderr.write("warning unsupported arguments in stream initialization :"+k+"\n")
+         if self.Codec == NULL:
+             raise IOError("Unable to get decoder")
+@@ -924,7 +922,6 @@
+             self.CodecCtx.flags = self.CodecCtx.flags | CODEC_FLAG_TRUNCATED
+         avcodec_open(self.CodecCtx, self.Codec)
+         if args.has_key("hurry_mode"):
+-            self.CodecCtx.hurry_up=2
+             self.CodecCtx.skip_loop_filter=32
+             self.CodecCtx.skip_frame=32
+             self.CodecCtx.skip_idct=32
+@@ -934,8 +931,6 @@
+             self.CodecCtx.skip_idct=args["skip_idct"]
+         if args.has_key("skip_loop_filter"):
+             self.CodecCtx.skip_loop_filter=args["skip_loop_filter"]
+-        if args.has_key("hurry_up"):
+-            self.CodecCtx.skip_loop_filter=args["hurry_up"]
+         if args.has_key("dct_algo"):
+             self.CodecCtx.dct_algo=args["dct_algo"]
+         if args.has_key("idct_algo"):
+@@ -1389,7 +1384,6 @@
+             skip_frame
+             skip_idct
+             skip_loop_filter
+-            hurry_up
+             dct_algo
+             idct_algo
+ 
+@@ -1668,12 +1662,10 @@
+         if (b) :
+             self.CodecCtx.skip_idct = AVDISCARD_BIDIR
+             self.CodecCtx.skip_frame = AVDISCARD_BIDIR
+-            self.CodecCtx.hurry_up = 1
+             self.hurried_frames = 0
+         else:
+             self.CodecCtx.skip_idct = 0
+             self.CodecCtx.skip_frame = 0
+-            self.CodecCtx.hurry_up = 0
+ 
+     ########################################
+     ###
+@@ -1832,7 +1824,7 @@
+     cdef int with_readahead
+     cdef unsigned long long int seek_before_security_interval
+ 
+-    def __new__(self,with_readahead=True,seek_before=4000):
++    def __cinit__(self,with_readahead=True,seek_before=4000):
+         self.filename = None
+         self.tracks=[]
+         self.ctracks=NULL
+@@ -1902,7 +1894,7 @@
+ 
+         if (mode=="w"):
+             raise Exception,"Not yet supported sorry"
+-            self.FormatCtx.oformat = guess_format(NULL, filename_, NULL);
++            self.FormatCtx.oformat = av_guess_format(NULL, filename_, NULL);
+             if (self.FormatCtx.oformat==NULL):
+                 raise Exception, "Unable to find output format for %s\n"
+ 
+@@ -1960,7 +1952,7 @@
+         cdef  AVFormatContext * oc
+         oc = avformat_alloc_context()
+         # Guess file format with file extention
+-        oc.oformat = guess_format(NULL, filename_, NULL);
++        oc.oformat = av_guess_format(NULL, filename_, NULL);
+         if (oc.oformat==NULL):
+             raise Exception, "Unable to find output format for %s\n"
+         # Alloc priv_data for format
+@@ -2038,7 +2030,7 @@
+                 raise IOError("Unable to find specified Track")
+ 
+             CodecCtx = self.FormatCtx.streams[trackno].codec
+-            if (s[0]==CODEC_TYPE_VIDEO):
++            if (s[0]==AVMEDIA_TYPE_VIDEO):
+                 try:
+                     vt=VideoTrack()
+                 except:
+@@ -2048,7 +2040,7 @@
+                 vt.init0(self,trackno,  CodecCtx) ## here we are passing cpointers so we do a C call
+                 vt.init(**s[2])## here we do a python call
+                 self.tracks.append(vt)
+-            elif (s[0]==CODEC_TYPE_AUDIO):
++            elif (s[0]==AVMEDIA_TYPE_AUDIO):
+                 try:
+                     at=AudioTrack()
+                 except:
+@@ -2171,11 +2163,11 @@
+                 ## I don't know why it seems that Windows Cython have problem calling the correct virtual function
+                 ##
+                 ##
+-                if ct.CodecCtx.codec_type==CODEC_TYPE_VIDEO:
++                if ct.CodecCtx.codec_type==AVMEDIA_TYPE_VIDEO:
+                     processed=True
+                     vt=ct
+                     vt.process_packet(self.packet)
+-                elif ct.CodecCtx.codec_type==CODEC_TYPE_AUDIO:
++                elif ct.CodecCtx.codec_type==AVMEDIA_TYPE_AUDIO:
+                     processed=True
+                     at=ct
+                     at.process_packet(self.packet)
diff --git a/easybuild/easyconfigs/p/PyFFmpeg/PyFFmpeg-2.1beta_ffmpegpath.patch b/easybuild/easyconfigs/p/PyFFmpeg/PyFFmpeg-2.1beta_ffmpegpath.patch
new file mode 100644
index 0000000000000000000000000000000000000000..8196e01135b46fbdc7a36d90c4915d74100903ba
--- /dev/null
+++ b/easybuild/easyconfigs/p/PyFFmpeg/PyFFmpeg-2.1beta_ffmpegpath.patch
@@ -0,0 +1,21 @@
+specify FFmpeg install location in PyFFmpeg's setup.py
+author: Kenneth Hoste (HPC-UGent)
+--- pyffmpeg-2.1beta/setup.py.orig	2011-01-12 16:46:15.000000000 +0100
++++ pyffmpeg-2.1beta/setup.py	2016-02-17 10:52:57.454775826 +0100
+@@ -33,7 +33,7 @@
+     
+ else:
+     ffmpegpath = '/opt/ffmpeg'
+-    for x in [ os.environ["HOME"]+"build/ffmpeg",  '/usr/local/ffmpeg',  '/opt/ffmpeg' ]:
++    for x in [os.environ['EBROOTFFMPEG'], os.environ["HOME"]+"build/ffmpeg",  '/usr/local/ffmpeg',  '/opt/ffmpeg' ]:
+         try:
+              os.stat(x)
+              ffmpegpath = x
+@@ -69,6 +69,7 @@
+     map(lambda x: x not in result and result.append(x), deps)
+     return result
+ 
++print "ffmpegpath: %s" % ffmpegpath
+ 
+ libs = [ 'avformat', 'avcodec', 'avutil', 'swscale' ]
+ incdir = [ path_join(ffmpegpath, 'include'), "/usr/include/ffmpeg" , "./include" ] 
diff --git a/easybuild/easyconfigs/p/PyGObject/PyGObject-2.28.6-intel-2016a-Python-2.7.11.eb b/easybuild/easyconfigs/p/PyGObject/PyGObject-2.28.6-intel-2016a-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..3291d71bff37861840c859cdc16b684371d15316
--- /dev/null
+++ b/easybuild/easyconfigs/p/PyGObject/PyGObject-2.28.6-intel-2016a-Python-2.7.11.eb
@@ -0,0 +1,40 @@
+easyblock = 'ConfigureMake'
+
+name = 'PyGObject'
+version = '2.28.6'
+
+homepage = 'http://www.pygtk.org/'
+description = """Python Bindings for GLib/GObject/GIO/GTK+"""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+source_urls = [FTPGNOME_SOURCE]
+sources = [SOURCELOWER_TAR_XZ]
+
+patches = ['PyGObject-%(version)s_enum-types.patch']
+
+pyver = '2.7.11'
+pyshortver = '.'.join(pyver.split('.')[:2])
+versionsuffix = '-Python-%s' % pyver
+
+glibver = '2.47.5'
+dependencies = [
+    ('Python', pyver),
+    ('GLib', glibver),
+    ('GObject-Introspection', '1.47.1'),
+    ('PyCairo', '1.10.0', versionsuffix),
+]
+
+configopts = "--disable-introspection"
+
+modextrapaths = {
+    'PYTHONPATH': ['lib/python%s/site-packages' % pyshortver, 'lib64/python%s/site-packages' % pyshortver],
+}
+
+sanity_check_paths = {
+    'files': ['include/pygtk-%(version_major)s.0/pyglib.h', 'include/pygtk-%(version_major)s.0/pygobject.h',
+              'lib/libpyglib-%(version_major)s.0-python.so'],
+    'dirs': ['bin', 'lib/python%s/site-packages/' % pyshortver],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/p/PyGObject/PyGObject-2.28.6_enum-types.patch b/easybuild/easyconfigs/p/PyGObject/PyGObject-2.28.6_enum-types.patch
new file mode 100644
index 0000000000000000000000000000000000000000..420f56b036cab4cda8fcd7dd8d8c18b7e963e62a
--- /dev/null
+++ b/easybuild/easyconfigs/p/PyGObject/PyGObject-2.28.6_enum-types.patch
@@ -0,0 +1,50 @@
+From 42d01f060c5d764baa881d13c103d68897163a49 Mon Sep 17 00:00:00 2001
+From: Ryan Lortie <desrt@desrt.ca>
+Date: Mon, 12 Mar 2012 16:44:14 -0400
+Subject: gio-types.defs: change some enums to flags
+
+These flags types were originally incorrectly handled in glib as being
+enums.  That bug was fixed, but they're still enums here, leading to
+warnings about the mismatch.
+
+Change them to flags.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=668522
+---
+ gio/gio-types.defs | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/gio/gio-types.defs b/gio/gio-types.defs
+index 331e0bc..7eee5c8 100644
+--- a/gio/gio-types.defs
++++ b/gio/gio-types.defs
+@@ -526,7 +526,7 @@
+   )
+ )
+ 
+-(define-enum MountMountFlags
++(define-flags MountMountFlags
+   (in-module "gio")
+   (c-name "GMountMountFlags")
+   (gtype-id "G_TYPE_MOUNT_MOUNT_FLAGS")
+@@ -545,7 +545,7 @@
+   )
+ )
+ 
+-(define-enum DriveStartFlags
++(define-flags DriveStartFlags
+   (in-module "gio")
+   (c-name "GDriveStartFlags")
+   (gtype-id "G_TYPE_DRIVE_START_FLAGS")
+@@ -770,7 +770,7 @@
+   )
+ )
+ 
+-(define-enum SocketMsgFlags
++(define-flags SocketMsgFlags
+   (in-module "gio")
+   (c-name "GSocketMsgFlags")
+   (gtype-id "G_TYPE_SOCKET_MSG_FLAGS")
+-- 
+cgit v0.11.2
+
diff --git a/easybuild/easyconfigs/p/PyGTK/PyGTK-2.24.0-intel-2016a-Python-2.7.11.eb b/easybuild/easyconfigs/p/PyGTK/PyGTK-2.24.0-intel-2016a-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..d470f598faf1d90014404f13b273d3259a7ea3e3
--- /dev/null
+++ b/easybuild/easyconfigs/p/PyGTK/PyGTK-2.24.0-intel-2016a-Python-2.7.11.eb
@@ -0,0 +1,50 @@
+easyblock = 'ConfigureMake'
+
+name = 'PyGTK'
+version = '2.24.0'
+
+homepage = 'http://www.pygtk.org/'
+description = """PyGTK lets you to easily create programs with a graphical user interface
+ using the Python programming language."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCELOWER_TAR_BZ2]
+
+pyver = '2.7.11'
+pyshortver = '.'.join(pyver.split('.')[:2])
+versionsuffix = '-Python-%s' % pyver
+
+glibver = '2.47.5'
+dependencies = [
+    ('Python', pyver),
+    ('GLib', glibver),
+    ('PyGObject', '2.28.6', versionsuffix),
+    ('GTK+', '2.24.28'),
+    ('ATK', '2.18.0'),
+    ('PyCairo', '1.10.0', versionsuffix),
+]
+
+postinstallcmds = [
+    "sed -i s#'codegendir=${datadir}'#codegendir=$EBROOTPYGOBJECT/share# %(installdir)s/lib/pkgconfig/pygtk-2.0.pc",
+    "sed -i s#'exec_prefix=${prefix}'#exec_prefix=$EBROOTPYGOBJECT# %(installdir)s/bin/pygtk-codegen-2.0",
+]
+
+modextrapaths = {
+    'PYTHONPATH': [
+        'lib/python%s/site-packages' % pyshortver,
+        'lib64/python%s/site-packages' % pyshortver,
+        'lib/python%s/site-packages/gtk-%%(version_major)s.0' % pyshortver,
+        'lib64/python%s/site-packages/gtk-%%(version_major)s.0' % pyshortver,
+    ],
+}
+
+sanity_check_paths = {
+    'files': ['lib/pkgconfig/pygtk-%(version_major)s.0.pc'],
+    'dirs': ['lib/pygtk'],
+}
+
+sanity_check_commands = [('python', "-c 'import gtk'")]
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/p/PyYAML/PyYAML-3.10-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/p/PyYAML/PyYAML-3.10-goolf-1.4.10-Python-2.7.3.eb
index d2c2d3137f63d5f3b09761d6fbed4cc0b7790838..96929205464c956176b3f0a2a0a6737e77c810ab 100644
--- a/easybuild/easyconfigs/p/PyYAML/PyYAML-3.10-goolf-1.4.10-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/p/PyYAML/PyYAML-3.10-goolf-1.4.10-Python-2.7.3.eb
@@ -30,4 +30,3 @@ sanity_check_paths = {
 }
 
 moduleclass = 'lib'
-
diff --git a/easybuild/easyconfigs/p/PyYAML/PyYAML-3.10-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/p/PyYAML/PyYAML-3.10-ictce-5.3.0-Python-2.7.3.eb
index d3c883a5e6d7f03958a5d3d79eef1ffaaaa376ba..0116c1297c1e9a8e85e5e38c99e64f5ad769633b 100644
--- a/easybuild/easyconfigs/p/PyYAML/PyYAML-3.10-ictce-5.3.0-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/p/PyYAML/PyYAML-3.10-ictce-5.3.0-Python-2.7.3.eb
@@ -30,4 +30,3 @@ sanity_check_paths = {
 }
 
 moduleclass = 'lib'
-
diff --git a/easybuild/easyconfigs/p/PyZMQ/PyZMQ-15.2.0-foss-2015a-Python-2.7.11-zmq4.eb b/easybuild/easyconfigs/p/PyZMQ/PyZMQ-15.2.0-foss-2015a-Python-2.7.11-zmq4.eb
new file mode 100644
index 0000000000000000000000000000000000000000..b6f32ee0fc6ea4d7e71f8af76cbf9b533c80abd0
--- /dev/null
+++ b/easybuild/easyconfigs/p/PyZMQ/PyZMQ-15.2.0-foss-2015a-Python-2.7.11-zmq4.eb
@@ -0,0 +1,33 @@
+easyblock = 'PythonPackage'
+
+name = 'PyZMQ'
+version = '15.2.0'
+
+homepage = 'http://www.zeromq.org/bindings:python'
+description = """Python bindings for ZeroMQ"""
+
+toolchain = {'name': 'foss', 'version': '2015a'}
+
+source_urls = [PYPI_LOWER_SOURCE]
+sources = [SOURCELOWER_TAR_GZ]
+
+python = 'Python'
+pythonversion = '2.7.11'
+pyshortver = '.'.join(pythonversion.split('.')[:2])
+zmqversion = '4.1.4'
+
+versionsuffix = '-%s-%s-%s' % (python, pythonversion, 'zmq%s' % zmqversion.split('.')[0])
+
+dependencies = [
+    (python, pythonversion),
+    ('ZeroMQ', zmqversion),
+]
+
+options = {'modulename': 'zmq'}
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%s/site-packages/zmq' % pyshortver],
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/p/Pyke/Pyke-1.1.1-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/p/Pyke/Pyke-1.1.1-goolf-1.4.10-Python-2.7.3.eb
index 3d8ae78e2cbe8549091c1c249d659814ca4e4635..fd5dce2efb6d58bd408d46d62c0c54bd9a20c76f 100644
--- a/easybuild/easyconfigs/p/Pyke/Pyke-1.1.1-goolf-1.4.10-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/p/Pyke/Pyke-1.1.1-goolf-1.4.10-Python-2.7.3.eb
@@ -19,9 +19,9 @@ pyver = '2.7.3'
 versionsuffix = "-%s-%s" % (python, pyver)
 
 dependencies = [
-     (python, pyver),
-     ('numpy','1.6.2', versionsuffix),
-     ('scipy', '0.11.0', versionsuffix),
+    (python, pyver),
+    ('numpy', '1.6.2', versionsuffix),
+    ('scipy', '0.11.0', versionsuffix),
 ]
 
 pyshortver = '.'.join(pyver.split('.')[:2])
diff --git a/easybuild/easyconfigs/p/Python/Python-2.5.6-goalf-1.1.0-no-OFED-bare.eb b/easybuild/easyconfigs/p/Python/Python-2.5.6-goalf-1.1.0-no-OFED-bare.eb
index 43ff3feba7790c36001122a64fc7d70826fec35f..6a564b9945e058c9007553f2c7c29083d994c50e 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.5.6-goalf-1.1.0-no-OFED-bare.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.5.6-goalf-1.1.0-no-OFED-bare.eb
@@ -18,7 +18,7 @@ dependencies = [
     ('zlib', '1.2.7'),
     ('libreadline', '6.2'),
     ('ncurses', '5.9'),
-#   ('OpenSSL', '1.0.1f'),  # OS dependency should be preferred for security reasons
+    #   ('OpenSSL', '1.0.1f'),  # OS dependency should be preferred for security reasons
 ]
 
 osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
diff --git a/easybuild/easyconfigs/p/Python/Python-2.5.6-gompi-1.4.12-no-OFED-bare.eb b/easybuild/easyconfigs/p/Python/Python-2.5.6-gompi-1.4.12-no-OFED-bare.eb
index f825fd87bd2b9a40df2c89c63725d9351cc179ac..031662cad87485185258a2da7127ce9d80c9aecd 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.5.6-gompi-1.4.12-no-OFED-bare.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.5.6-gompi-1.4.12-no-OFED-bare.eb
@@ -18,7 +18,7 @@ dependencies = [
     ('zlib', '1.2.7'),
     ('libreadline', '6.2'),
     ('ncurses', '5.9'),
-#   ('OpenSSL', '1.0.1f'),  # OS dependency should be preferred for security reasons
+    #   ('OpenSSL', '1.0.1f'),  # OS dependency should be preferred for security reasons
 ]
 
 osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
diff --git a/easybuild/easyconfigs/p/Python/Python-2.5.6-goolf-1.4.10-bare.eb b/easybuild/easyconfigs/p/Python/Python-2.5.6-goolf-1.4.10-bare.eb
index 18d0d4a8df4ba5018da9e938ead4ad9836e072fb..e815cc69b5fac246ff483cb8ff33cc5c6798bcee 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.5.6-goolf-1.4.10-bare.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.5.6-goolf-1.4.10-bare.eb
@@ -18,7 +18,7 @@ dependencies = [
     ('zlib', '1.2.7'),
     ('libreadline', '6.2'),
     ('ncurses', '5.9'),
-#   ('OpenSSL', '1.0.1f'),  # OS dependency should be preferred for security reasons
+    #   ('OpenSSL', '1.0.1f'),  # OS dependency should be preferred for security reasons
 ]
 
 osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
diff --git a/easybuild/easyconfigs/p/Python/Python-2.5.6-ictce-4.0.6-bare.eb b/easybuild/easyconfigs/p/Python/Python-2.5.6-ictce-4.0.6-bare.eb
index 23ddabe854a26e4f7d5889e51b683eb310c2161d..d698199a1268535f656fe9fcb0626cef15d3a6d2 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.5.6-ictce-4.0.6-bare.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.5.6-ictce-4.0.6-bare.eb
@@ -21,7 +21,7 @@ dependencies = [
     ('zlib', '1.2.7'),
     ('libreadline', '6.2'),
     ('ncurses', '5.9'),
-#   ('OpenSSL', '1.0.1f'),  # OS dependency should be preferred for security reasons
+    #   ('OpenSSL', '1.0.1f'),  # OS dependency should be preferred for security reasons
 ]
 
 osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
diff --git a/easybuild/easyconfigs/p/Python/Python-2.5.6-ictce-4.1.13-bare.eb b/easybuild/easyconfigs/p/Python/Python-2.5.6-ictce-4.1.13-bare.eb
index f747214b5c04de81ef7d934c297ae4e88c91fd55..dd9d71c15a91c383c1b34a3d7248b4c1000aa6c3 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.5.6-ictce-4.1.13-bare.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.5.6-ictce-4.1.13-bare.eb
@@ -21,7 +21,7 @@ dependencies = [
     ('zlib', '1.2.7'),
     ('libreadline', '6.2'),
     ('ncurses', '5.9'),
-#   ('OpenSSL', '1.0.1f'),  # OS dependency should be preferred for security reasons
+    #   ('OpenSSL', '1.0.1f'),  # OS dependency should be preferred for security reasons
 ]
 
 osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
diff --git a/easybuild/easyconfigs/p/Python/Python-2.5.6-ictce-5.2.0-bare.eb b/easybuild/easyconfigs/p/Python/Python-2.5.6-ictce-5.2.0-bare.eb
index 0228eae5bec85243ecadf62db0050da407306ff8..809068de303a54513a010d973a08f6d7edcf7a51 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.5.6-ictce-5.2.0-bare.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.5.6-ictce-5.2.0-bare.eb
@@ -18,7 +18,7 @@ dependencies = [
     ('zlib', '1.2.7'),
     ('libreadline', '6.2'),
     ('ncurses', '5.9'),
-#   ('OpenSSL', '1.0.1f'),  # OS dependency should be preferred for security reasons
+    #   ('OpenSSL', '1.0.1f'),  # OS dependency should be preferred for security reasons
 ]
 
 osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
diff --git a/easybuild/easyconfigs/p/Python/Python-2.5.6-ictce-5.3.0-bare.eb b/easybuild/easyconfigs/p/Python/Python-2.5.6-ictce-5.3.0-bare.eb
index fc44c37e78ed1f71580f531eaf88776d834d9af1..c781bfe8b74bc4c9dceb572c6481f7b6c11c95e7 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.5.6-ictce-5.3.0-bare.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.5.6-ictce-5.3.0-bare.eb
@@ -18,7 +18,7 @@ dependencies = [
     ('zlib', '1.2.7'),
     ('libreadline', '6.2'),
     ('ncurses', '5.9'),
-#   ('OpenSSL', '1.0.1f'),  # OS dependency should be preferred for security reasons
+    #   ('OpenSSL', '1.0.1f'),  # OS dependency should be preferred for security reasons
 ]
 
 osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.10-GCC-4.9.3-2.25-bare.eb b/easybuild/easyconfigs/p/Python/Python-2.7.10-GCC-4.9.3-2.25-bare.eb
index 40981226c2b71549d82971518de294c5b59cb0d1..c19c8970457265734e48c582d48254519bd9c0ab 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.10-GCC-4.9.3-2.25-bare.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.10-GCC-4.9.3-2.25-bare.eb
@@ -19,8 +19,8 @@ dependencies = [
     ('ncurses', '6.0', '', ('GCCcore', '4.9.3')),
     ('SQLite', '3.8.10.2'),
     ('Tk', '8.6.4', '-no-X11'),
-#   ('OpenSSL', '1.0.1k'),  # OS dependency should be preferred if the os version is more recent then this version, it's
-#   nice to have an up to date openssl for security reasons
+    #   ('OpenSSL', '1.0.1k'),  # OS dependency should be preferred if the os version is more recent then this version, it's
+    #   nice to have an up to date openssl for security reasons
 ]
 
 osdependencies = [('openssl-devel', 'libssl-dev')]
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.10-GNU-4.9.3-2.25-bare.eb b/easybuild/easyconfigs/p/Python/Python-2.7.10-GNU-4.9.3-2.25-bare.eb
index 6ecda7651186f7725ec29354b28582725378b5d8..094f5e83b06bb0f33397874d5ed0a5ad815fc64d 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.10-GNU-4.9.3-2.25-bare.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.10-GNU-4.9.3-2.25-bare.eb
@@ -19,8 +19,8 @@ dependencies = [
     ('ncurses', '5.9'),
     ('SQLite', '3.8.10.2'),
     ('Tk', '8.6.4', '-no-X11'),
-#   ('OpenSSL', '1.0.1k'),  # OS dependency should be preferred if the os version is more recent then this version, it's
-#   nice to have an up to date openssl for security reasons
+    #   ('OpenSSL', '1.0.1k'),  # OS dependency should be preferred if the os version is more recent then this version, it's
+    #   nice to have an up to date openssl for security reasons
 ]
 
 osdependencies = [('openssl-devel', 'libssl-dev')]
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.10-foss-2015a.eb b/easybuild/easyconfigs/p/Python/Python-2.7.10-foss-2015a.eb
index 8e4cfabe9d4b2e41d247f5a137f6a22eda9f154d..2110e24871ad60fa20c219404a6e3267868524df 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.10-foss-2015a.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.10-foss-2015a.eb
@@ -23,8 +23,8 @@ dependencies = [
     ('SQLite', '3.8.10.2'),
     ('Tk', '8.6.4', '-no-X11'),
     ('GMP', '6.0.0a', '', ('GCC', '4.9.2')),  # required for pycrypto
-#   ('OpenSSL', '1.0.1m'),  # OS dependency should be preferred if the os version is more recent then this version, it's
-#   nice to have an up to date openssl for security reasons
+    #   ('OpenSSL', '1.0.1m'),  # OS dependency should be preferred if the os version is more recent then this version, it's
+    #   nice to have an up to date openssl for security reasons
 ]
 
 osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
@@ -43,9 +43,7 @@ exts_list = [
     }),
     ('numpy', numpyversion, {
         'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numpyversion, 'download')],
-        'patches': [
-            'numpy-1.8.0-mkl.patch', # % numpyversion,
-        ],
+        'patches': ['numpy-1.8.0-mkl.patch'],
     }),
     ('scipy', scipyversion, {
         'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scipyversion, 'download')],
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.10-foss-2015b.eb b/easybuild/easyconfigs/p/Python/Python-2.7.10-foss-2015b.eb
index 45878617c62869a77b5253ce14fd90b4bc19c777..76db705ebd43c5cb0af06dbf7336ff68a6cd2fad 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.10-foss-2015b.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.10-foss-2015b.eb
@@ -23,8 +23,8 @@ dependencies = [
     ('SQLite', '3.8.10.2'),
     ('Tk', '8.6.4', '-no-X11'),
     ('GMP', '6.0.0a', '', ('GNU', '4.9.3-2.25')),  # required for pycrypto
-#   ('OpenSSL', '1.0.1m'),  # OS dependency should be preferred if the os version is more recent then this version, it's
-#   nice to have an up to date openssl for security reasons
+    #   ('OpenSSL', '1.0.1m'),  # OS dependency should be preferred if the os version is more recent then this version, it's
+    #   nice to have an up to date openssl for security reasons
 ]
 
 osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
@@ -43,9 +43,7 @@ exts_list = [
     }),
     ('numpy', numpyversion, {
         'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numpyversion, 'download')],
-        'patches': [
-            'numpy-1.8.0-mkl.patch', # % numpyversion,
-        ],
+        'patches': ['numpy-1.8.0-mkl.patch'],
     }),
     ('scipy', scipyversion, {
         'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scipyversion, 'download')],
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.10-gimkl-2.11.5.eb b/easybuild/easyconfigs/p/Python/Python-2.7.10-gimkl-2.11.5.eb
index 4ae2c2b5e69a19deadb972af3a084fa8b1abe176..a5549be2988dac0021bea2cddf1a5771f2aaac77 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.10-gimkl-2.11.5.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.10-gimkl-2.11.5.eb
@@ -22,8 +22,8 @@ dependencies = [
     ('ncurses', '5.9'),
     ('SQLite', '3.8.10.2'),
     ('Tk', '8.6.4', '-no-X11'),
-#   ('OpenSSL', '1.0.1m'),  # OS dependency should be preferred if the os version is more recent then this version, it's
-#   nice to have an up to date openssl for security reasons
+    #   ('OpenSSL', '1.0.1m'),  # OS dependency should be preferred if the os version is more recent then this version, it's
+    #   nice to have an up to date openssl for security reasons
 ]
 
 osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
@@ -42,9 +42,7 @@ exts_list = [
     }),
     ('numpy', numpyversion, {
         'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numpyversion, 'download')],
-        'patches': [
-            'numpy-1.8.0-mkl.patch', # % numpyversion,
-        ],
+        'patches': ['numpy-1.8.0-mkl.patch'],
     }),
     ('scipy', scipyversion, {
         'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scipyversion, 'download')],
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.10-goolf-1.4.10.eb b/easybuild/easyconfigs/p/Python/Python-2.7.10-goolf-1.4.10.eb
index 66bb207792660d2f60d0f0ec3332b240b72fa943..1156ffc2af46661292bc90d9725cd9ae06ccf773 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.10-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.10-goolf-1.4.10.eb
@@ -23,8 +23,8 @@ dependencies = [
     ('SQLite', '3.8.10.2'),
     ('Tk', '8.6.4', '-no-X11'),
     ('GMP', '6.0.0a', '', ('GCC', '4.7.2')),  # required for pycrypto
-#   ('OpenSSL', '1.0.1m'),  # OS dependency should be preferred if the os version is more recent then this version, it's
-#   nice to have an up to date openssl for security reasons
+    #   ('OpenSSL', '1.0.1m'),  # OS dependency should be preferred if the os version is more recent then this version, it's
+    #   nice to have an up to date openssl for security reasons
 ]
 
 osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
@@ -43,9 +43,7 @@ exts_list = [
     }),
     ('numpy', numpyversion, {
         'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numpyversion, 'download')],
-        'patches': [
-            'numpy-1.8.0-mkl.patch', # % numpyversion,
-        ],
+        'patches': ['numpy-1.8.0-mkl.patch'],
     }),
     ('scipy', scipyversion, {
         'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scipyversion, 'download')],
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.10-goolf-1.7.20.eb b/easybuild/easyconfigs/p/Python/Python-2.7.10-goolf-1.7.20.eb
index e5f6c7aacced28f0598bd5a0b8ad90eff0dd7f3b..56b2274143f301040e8858e71cff60578c8af7b2 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.10-goolf-1.7.20.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.10-goolf-1.7.20.eb
@@ -23,8 +23,8 @@ dependencies = [
     ('SQLite', '3.8.10.2'),
     ('Tk', '8.6.4', '-no-X11'),
     ('GMP', '6.0.0a', '', ('GCC', '4.8.4')),  # required for pycrypto
-#   ('OpenSSL', '1.0.1m'),  # OS dependency should be preferred if the os version is more recent then this version, it's
-#   nice to have an up to date openssl for security reasons
+    #   ('OpenSSL', '1.0.1m'),  # OS dependency should be preferred if the os version is more recent then this version, it's
+    #   nice to have an up to date openssl for security reasons
 ]
 
 osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
@@ -43,9 +43,7 @@ exts_list = [
     }),
     ('numpy', numpyversion, {
         'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numpyversion, 'download')],
-        'patches': [
-            'numpy-1.8.0-mkl.patch', # % numpyversion,
-        ],
+        'patches': ['numpy-1.8.0-mkl.patch'],
     }),
     ('scipy', scipyversion, {
         'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scipyversion, 'download')],
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.10-intel-2015a.eb b/easybuild/easyconfigs/p/Python/Python-2.7.10-intel-2015a.eb
index f5c2309ea848d322c318295c93ffcb02fb1ccccd..2661d5c96a779fadeb6fd65af456eaf45aa0aac1 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.10-intel-2015a.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.10-intel-2015a.eb
@@ -23,8 +23,8 @@ dependencies = [
     ('SQLite', '3.8.10.2'),
     ('Tk', '8.6.4', '-no-X11'),
     ('GMP', '6.0.0a', '', ('GCC', '4.9.2')),  # required for pycrypto
-#   ('OpenSSL', '1.0.1m'),  # OS dependency should be preferred if the os version is more recent then this version, it's
-#   nice to have an up to date openssl for security reasons
+    #   ('OpenSSL', '1.0.1m'),  # OS dependency should be preferred if the os version is more recent then this version, it's
+    #   nice to have an up to date openssl for security reasons
 ]
 
 osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
@@ -43,9 +43,7 @@ exts_list = [
     }),
     ('numpy', numpyversion, {
         'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numpyversion, 'download')],
-        'patches': [
-            'numpy-1.8.0-mkl.patch', # % numpyversion,
-        ],
+        'patches': ['numpy-1.8.0-mkl.patch'],
     }),
     ('scipy', scipyversion, {
         'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scipyversion, 'download')],
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.10-intel-2015b.eb b/easybuild/easyconfigs/p/Python/Python-2.7.10-intel-2015b.eb
index a5115dc2be096bf024fe6ee931c6096c2baca5d2..94c61afabcb5d86a3a178d1a125564ec96ec188f 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.10-intel-2015b.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.10-intel-2015b.eb
@@ -22,8 +22,8 @@ dependencies = [
     ('ncurses', '5.9'),
     ('SQLite', '3.8.10.2'),
     ('Tk', '8.6.4', '-no-X11'),
-#   ('OpenSSL', '1.0.1m'),  # OS dependency should be preferred if the os version is more recent then this version, it's
-#   nice to have an up to date openssl for security reasons
+    #   ('OpenSSL', '1.0.1m'),  # OS dependency should be preferred if the os version is more recent then this version, it's
+    #   nice to have an up to date openssl for security reasons
 ]
 
 osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
@@ -42,9 +42,7 @@ exts_list = [
     }),
     ('numpy', numpyversion, {
         'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numpyversion, 'download')],
-        'patches': [
-            'numpy-1.8.0-mkl.patch', # % numpyversion,
-        ],
+        'patches': ['numpy-1.8.0-mkl.patch'],
     }),
     ('scipy', scipyversion, {
         'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scipyversion, 'download')],
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.11-foss-2015a.eb b/easybuild/easyconfigs/p/Python/Python-2.7.11-foss-2015a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..34c45f4ac7b1e045cb9b75386c99a1aafad36b44
--- /dev/null
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.11-foss-2015a.eb
@@ -0,0 +1,131 @@
+name = 'Python'
+version = '2.7.11'
+
+homepage = 'http://python.org/'
+description = """Python is a programming language that lets you work more quickly and integrate your systems
+ more effectively."""
+
+toolchain = {'name': 'foss', 'version': '2015a'}
+toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
+
+numpyversion = '1.10.1'
+scipyversion = '0.16.1'
+
+source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
+sources = [SOURCE_TGZ]
+
+# python needs bzip2 to build the bz2 package
+dependencies = [
+    ('bzip2', '1.0.6'),
+    ('zlib', '1.2.8'),
+    ('libreadline', '6.3'),
+    ('ncurses', '5.9'),
+    ('SQLite', '3.10.0'),
+    ('Tk', '8.6.4', '-no-X11'),
+    ('GMP', '6.1.0'),  # required for pycrypto
+    #   ('OpenSSL', '1.0.1q'),  # OS dependency should be preferred if the os version is more recent then this version, it's
+    #   nice to have an up to date openssl for security reasons
+]
+
+osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
+
+# order is important!
+# package versions updated May 28th 2015
+exts_list = [
+    ('setuptools', '18.7.1', {
+        'source_urls': ['https://pypi.python.org/packages/source/s/setuptools/'],
+    }),
+    ('pip', '7.1.2', {
+        'source_urls': ['https://pypi.python.org/packages/source/p/pip/'],
+    }),
+    ('nose', '1.3.7', {
+        'source_urls': ['https://pypi.python.org/packages/source/n/nose/'],
+    }),
+    ('numpy', numpyversion, {
+        'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numpyversion, 'download')],
+        'patches': ['numpy-1.8.0-mkl.patch'],
+    }),
+    ('scipy', scipyversion, {
+        'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scipyversion, 'download')],
+    }),
+    ('blist', '1.3.6', {
+        'source_urls': ['https://pypi.python.org/packages/source/b/blist/'],
+    }),
+    ('mpi4py', '1.3.1', {
+        'source_urls': ['http://bitbucket.org/mpi4py/mpi4py/downloads/'],
+    }),
+    ('paycheck', '1.0.2', {
+        'source_urls': ['https://pypi.python.org/packages/source/p/paycheck/'],
+    }),
+    ('argparse', '1.4.0', {
+        'source_urls': ['https://pypi.python.org/packages/source/a/argparse/'],
+    }),
+    ('pbr', '1.8.1', {
+        'source_urls': ['https://pypi.python.org/packages/source/p/pbr/'],
+    }),
+    ('lockfile', '0.12.2', {
+        'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'],
+    }),
+    ('Cython', '0.23.4', {
+        'source_urls': ['http://www.cython.org/release/'],
+    }),
+    ('six', '1.10.0', {
+        'source_urls': ['https://pypi.python.org/packages/source/s/six/'],
+    }),
+    ('dateutil', '2.4.2', {
+        'source_tmpl': 'python-%(name)s-%(version)s.tar.gz',
+        'source_urls': ['https://pypi.python.org/packages/source/p/python-dateutil/'],
+    }),
+    ('deap', '1.0.2', {
+        'source_tmpl': '%(name)s-%(version)s.post2.tar.gz',
+        'source_urls': ['https://pypi.python.org/packages/source/d/deap/'],
+    }),
+    ('decorator', '4.0.4', {
+        'source_urls': ['https://pypi.python.org/packages/source/d/decorator/'],
+    }),
+    ('arff', '2.1.0', {
+        'source_tmpl': 'liac-%(name)s-%(version)s.zip',
+        'source_urls': ['https://pypi.python.org/packages/source/l/liac-arff/'],
+    }),
+    ('pycrypto', '2.6.1', {
+        'modulename': 'Crypto',
+        'source_urls': ['http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/'],
+    }),
+    ('ecdsa', '0.13', {
+        'source_urls': ['https://pypi.python.org/packages/source/e/ecdsa/'],
+    }),
+    ('paramiko', '1.16.0', {
+        'source_urls': ['https://pypi.python.org/packages/source/p/paramiko/'],
+    }),
+    ('pyparsing', '2.0.6', {
+        'source_urls': ['https://pypi.python.org/packages/source/p/pyparsing/'],
+    }),
+    ('netifaces', '0.10.4', {
+        'source_urls': ['https://pypi.python.org/packages/source/n/netifaces'],
+    }),
+    ('netaddr', '0.7.18', {
+        'source_urls': ['https://pypi.python.org/packages/source/n/netaddr'],
+    }),
+    ('funcsigs', '0.4', {
+        'source_urls': ['https://pypi.python.org/packages/source/f/funcsigs'],
+    }),
+    ('mock', '1.3.0', {
+        'source_urls': ['https://pypi.python.org/packages/source/m/mock'],
+    }),
+    ('pytz', '2015.7', {
+        'source_urls': ['https://pypi.python.org/packages/source/p/pytz'],
+    }),
+    ('pandas', '0.17.1', {
+        'source_urls': ['https://pypi.python.org/packages/source/p/pandas'],
+    }),
+    ('enum34', '1.1.2', {
+        'modulename': 'enum',
+        'source_urls': ['https://pypi.python.org/packages/source/e/enum34'],
+    }),
+    ('bitstring', '3.1.3', {
+        'source_tmpl': '%(name)s-%(version)s.zip',
+        'source_urls': ['https://pypi.python.org/packages/source/b/bitstring'],
+    }),
+]
+
+moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.11-foss-2016a.eb b/easybuild/easyconfigs/p/Python/Python-2.7.11-foss-2016a.eb
index 4bce06c8fe162ba58bf829e93d037373da229393..deaca9e5fd72a80d160e69ddae0c71e70b8a8da6 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.11-foss-2016a.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.11-foss-2016a.eb
@@ -23,8 +23,8 @@ dependencies = [
     ('SQLite', '3.9.2'),
     ('Tk', '8.6.4', '-no-X11'),
     ('GMP', '6.1.0'),
-#   ('OpenSSL', '1.0.1q'),  # OS dependency should be preferred if the os version is more recent then this version, it's
-#   nice to have an up to date openssl for security reasons
+    #   ('OpenSSL', '1.0.1q'),  # OS dependency should be preferred if the os version is more recent then this version, it's
+    #   nice to have an up to date openssl for security reasons
 ]
 
 osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
@@ -43,9 +43,7 @@ exts_list = [
     }),
     ('numpy', numpyversion, {
         'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numpyversion, 'download')],
-        'patches': [
-            'numpy-1.8.0-mkl.patch', # % numpyversion,
-        ],
+        'patches': ['numpy-1.8.0-mkl.patch'],
     }),
     ('scipy', scipyversion, {
         'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scipyversion, 'download')],
@@ -124,6 +122,10 @@ exts_list = [
         'modulename': 'enum',
         'source_urls': ['https://pypi.python.org/packages/source/e/enum34'],
     }),
+    ('bitstring', '3.1.3', {
+        'source_tmpl': '%(name)s-%(version)s.zip',
+        'source_urls': ['https://pypi.python.org/packages/source/b/bitstring'],
+    }),
 ]
 
 moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.11-intel-2015b.eb b/easybuild/easyconfigs/p/Python/Python-2.7.11-intel-2015b.eb
index c697adc7c774765c3d911bb047416b0c503a4995..74d0c82b50b4903ee0d9355c23135601db0fad8e 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.11-intel-2015b.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.11-intel-2015b.eb
@@ -23,8 +23,8 @@ dependencies = [
     ('SQLite', '3.9.2'),
     ('Tk', '8.6.4', '-no-X11'),
     ('GMP', '6.1.0'),
-#   ('OpenSSL', '1.0.1q'),  # OS dependency should be preferred if the os version is more recent then this version, it's
-#   nice to have an up to date openssl for security reasons
+    #   ('OpenSSL', '1.0.1q'),  # OS dependency should be preferred if the os version is more recent then this version, it's
+    #   nice to have an up to date openssl for security reasons
 ]
 
 osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
@@ -44,7 +44,8 @@ exts_list = [
     ('numpy', numpyversion, {
         'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numpyversion, 'download')],
         'patches': [
-            'numpy-1.8.0-mkl.patch', # % numpyversion,
+            'numpy-1.8.0-mkl.patch',
+            'numpy-%s-sse42.patch' % numpyversion,
         ],
     }),
     ('scipy', scipyversion, {
@@ -124,6 +125,10 @@ exts_list = [
         'modulename': 'enum',
         'source_urls': ['https://pypi.python.org/packages/source/e/enum34'],
     }),
+    ('bitstring', '3.1.3', {
+        'source_tmpl': '%(name)s-%(version)s.zip',
+        'source_urls': ['https://pypi.python.org/packages/source/b/bitstring'],
+    }),
 ]
 
 moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.11-intel-2016a.eb b/easybuild/easyconfigs/p/Python/Python-2.7.11-intel-2016a.eb
index b615ded539138b93417c939d1b4fd0a1ee78cd0f..6819a492c96b538df8b0da5f7441511bf2d1e143 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.11-intel-2016a.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.11-intel-2016a.eb
@@ -23,8 +23,8 @@ dependencies = [
     ('SQLite', '3.9.2'),
     ('Tk', '8.6.4', '-no-X11'),
     ('GMP', '6.1.0'),
-#   ('OpenSSL', '1.0.1q'),  # OS dependency should be preferred if the os version is more recent then this version, it's
-#   nice to have an up to date openssl for security reasons
+    #   ('OpenSSL', '1.0.1q'),  # OS dependency should be preferred if the os version is more recent then this version, it's
+    #   nice to have an up to date openssl for security reasons
 ]
 
 osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
@@ -44,7 +44,8 @@ exts_list = [
     ('numpy', numpyversion, {
         'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numpyversion, 'download')],
         'patches': [
-            'numpy-1.8.0-mkl.patch', # % numpyversion,
+            'numpy-1.8.0-mkl.patch',
+            'numpy-%s-sse42.patch' % numpyversion,
         ],
     }),
     ('scipy', scipyversion, {
@@ -124,6 +125,10 @@ exts_list = [
         'modulename': 'enum',
         'source_urls': ['https://pypi.python.org/packages/source/e/enum34'],
     }),
+    ('bitstring', '3.1.3', {
+        'source_tmpl': '%(name)s-%(version)s.zip',
+        'source_urls': ['https://pypi.python.org/packages/source/b/bitstring'],
+    }),
 ]
 
 moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-cgmpolf-1.1.6.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-cgmpolf-1.1.6.eb
index b447f3f5c56fd2e47691d2c592643a6c91b818fd..458773a19ca69818f02788b8168b4ff2f5a57a47 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.3-cgmpolf-1.1.6.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-cgmpolf-1.1.6.eb
@@ -19,7 +19,7 @@ dependencies = [
     ('zlib', '1.2.7'),
     ('libreadline', '6.2'),
     ('ncurses', '5.9-20130406'),
-#   ('OpenSSL', '1.0.1f'),  # OS dependency should be preferred for security reasons
+    #   ('OpenSSL', '1.0.1f'),  # OS dependency should be preferred for security reasons
 ]
 
 osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-cgmvolf-1.1.12rc1.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-cgmvolf-1.1.12rc1.eb
index 3b9b9b0071c316fa3fe06218d68bf14614ce8525..8847eb716ad958585a1462cfcb3ec0db21ebebe6 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.3-cgmvolf-1.1.12rc1.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-cgmvolf-1.1.12rc1.eb
@@ -19,7 +19,7 @@ dependencies = [
     ('zlib', '1.2.7'),
     ('libreadline', '6.2'),
     ('ncurses', '5.9-20130406'),
-#   ('OpenSSL', '1.0.1f'),  # OS dependency should be preferred for security reasons
+    #   ('OpenSSL', '1.0.1f'),  # OS dependency should be preferred for security reasons
 ]
 
 osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-cgmvolf-1.2.7.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-cgmvolf-1.2.7.eb
index e9411a98a07021ce56ce98dd659466ea3fabd664..8721ba5f0a86b47f2fdf5f236aff04191d94a232 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.3-cgmvolf-1.2.7.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-cgmvolf-1.2.7.eb
@@ -19,7 +19,7 @@ dependencies = [
     ('zlib', '1.2.7'),
     ('libreadline', '6.2'),
     ('ncurses', '5.9-20130406'),
-#   ('OpenSSL', '1.0.1f'),  # OS dependency should be preferred for security reasons
+    #   ('OpenSSL', '1.0.1f'),  # OS dependency should be preferred for security reasons
 ]
 
 osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-cgoolf-1.1.7.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-cgoolf-1.1.7.eb
index 9d81cee86be481950aecd7b7cd7177b15061ad19..feaf2e76ec9ca818190b34aaecaaec25d2218eef 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.3-cgoolf-1.1.7.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-cgoolf-1.1.7.eb
@@ -19,7 +19,7 @@ dependencies = [
     ('zlib', '1.2.7'),
     ('libreadline', '6.2'),
     ('ncurses', '5.9-20130406'),
-#   ('OpenSSL', '1.0.1f'),  # OS dependency should be preferred for security reasons
+    #   ('OpenSSL', '1.0.1f'),  # OS dependency should be preferred for security reasons
 ]
 
 osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-gmpolf-1.4.8.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-gmpolf-1.4.8.eb
index b7dfb64df9b022f6ee658b86b4a939eb89230cd7..6bbc4316af7a2b38bf3d93880231785261eeffac 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.3-gmpolf-1.4.8.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-gmpolf-1.4.8.eb
@@ -19,7 +19,7 @@ dependencies = [
     ('zlib', '1.2.7'),
     ('libreadline', '6.2'),
     ('ncurses', '5.9'),
-#   ('OpenSSL', '1.0.1f'),  # OS dependency should be preferred for security reasons
+    #   ('OpenSSL', '1.0.1f'),  # OS dependency should be preferred for security reasons
 ]
 
 osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-gmvolf-1.7.12.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-gmvolf-1.7.12.eb
index 5eb4c88938f924fa0a64e6ef4a9473c64461dc4a..b6713093818a55f660b79e0b7873fd7df3022900 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.3-gmvolf-1.7.12.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-gmvolf-1.7.12.eb
@@ -19,7 +19,7 @@ dependencies = [
     ('zlib', '1.2.7'),
     ('libreadline', '6.2'),
     ('ncurses', '5.9-20130406'),
-#   ('OpenSSL', '1.0.1f'),  # OS dependency should be preferred for security reasons
+    #   ('OpenSSL', '1.0.1f'),  # OS dependency should be preferred for security reasons
 ]
 
 osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-gmvolf-1.7.12rc1.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-gmvolf-1.7.12rc1.eb
index 878951cc6e476ff20a71f61cae0f90c4c87951dc..383cedbc17d57cd3bcaa0b3a4cc203339e136edd 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.3-gmvolf-1.7.12rc1.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-gmvolf-1.7.12rc1.eb
@@ -19,7 +19,7 @@ dependencies = [
     ('zlib', '1.2.7'),
     ('libreadline', '6.2'),
     ('ncurses', '5.9-20130406'),
-#   ('OpenSSL', '1.0.1f'),  # OS dependency should be preferred for security reasons
+    #   ('OpenSSL', '1.0.1f'),  # OS dependency should be preferred for security reasons
 ]
 
 osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-goalf-1.1.0-no-OFED.eb
index 957d719fbd04d9e4a5f8b3b4013515b0f7e2330e..ffaa43d1efacaaeae03cb1dedd1577162ee8e491 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.3-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-goalf-1.1.0-no-OFED.eb
@@ -19,7 +19,7 @@ dependencies = [
     ('zlib', '1.2.7'),
     ('libreadline', '6.2'),
     ('ncurses', '5.9'),
-#   ('OpenSSL', '1.0.1f'),  # OS dependency should be preferred for security reasons
+    #   ('OpenSSL', '1.0.1f'),  # OS dependency should be preferred for security reasons
 ]
 
 osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-goolf-1.4.10.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-goolf-1.4.10.eb
index 49da1ce96f947abec5e8960eb4c7843f940bb27e..b20ffd67fb5a575df71ea292f4311d513348378b 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.3-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-goolf-1.4.10.eb
@@ -19,7 +19,7 @@ dependencies = [
     ('zlib', '1.2.7'),
     ('libreadline', '6.2'),
     ('ncurses', '5.9'),
-#   ('OpenSSL', '1.0.1f'),  # OS dependency should be preferred for security reasons
+    #   ('OpenSSL', '1.0.1f'),  # OS dependency should be preferred for security reasons
 ]
 
 osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-goolf-1.5.14.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-goolf-1.5.14.eb
index ff029a2234b253e799e285d736c993318aab0490..e087117a23517b8593e77efc650e6d5ab0885944 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.3-goolf-1.5.14.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-goolf-1.5.14.eb
@@ -19,7 +19,7 @@ dependencies = [
     ('zlib', '1.2.7'),
     ('libreadline', '6.2'),
     ('ncurses', '5.9'),
-#   ('OpenSSL', '1.0.1f'),  # OS dependency should be preferred for security reasons
+    #   ('OpenSSL', '1.0.1f'),  # OS dependency should be preferred for security reasons
 ]
 
 osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-4.0.6.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-4.0.6.eb
index 2ef8f9fc886b0c840beb8606ddd784e6dc44c807..04f049367bdf4021f4ec2af45a36eff04b7ec65f 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-4.0.6.eb
@@ -21,7 +21,7 @@ dependencies = [
     ('zlib', '1.2.7'),
     ('libreadline', '6.2'),
     ('ncurses', '5.9'),
-#   ('OpenSSL', '1.0.1f'),  # OS dependency should be preferred for security reasons
+    #   ('OpenSSL', '1.0.1f'),  # OS dependency should be preferred for security reasons
 ]
 
 osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-4.1.13.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-4.1.13.eb
index b5075a6a9a6b213bb75c831b9e13cc8944b748b9..f3c7ccd43d50161b87fd57ee4b714764222ddc6c 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-4.1.13.eb
@@ -21,7 +21,7 @@ dependencies = [
     ('zlib', '1.2.7'),
     ('libreadline', '6.2'),
     ('ncurses', '5.9'),
-#   ('OpenSSL', '1.0.1f'),  # OS dependency should be preferred for security reasons
+    #   ('OpenSSL', '1.0.1f'),  # OS dependency should be preferred for security reasons
 ]
 
 osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-5.2.0.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-5.2.0.eb
index e1bc68f6d19e46a49866fb09dbcefbdf7cd67a93..65a7050c90012aff70fd707e967d49c12fdf221f 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-5.2.0.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-5.2.0.eb
@@ -19,7 +19,7 @@ dependencies = [
     ('zlib', '1.2.7'),
     ('libreadline', '6.2'),
     ('ncurses', '5.9'),
-#   ('OpenSSL', '1.0.1f'),  # OS dependency should be preferred for security reasons
+    #   ('OpenSSL', '1.0.1f'),  # OS dependency should be preferred for security reasons
 ]
 
 osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-5.3.0.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-5.3.0.eb
index 1f6678ca7318f61796fe2f8a1f41f82f6c4c34b9..caf683b0c800a39ac4c46a2ed461893496c59dfa 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-ictce-5.3.0.eb
@@ -19,7 +19,7 @@ dependencies = [
     ('zlib', '1.2.7'),
     ('libreadline', '6.2'),
     ('ncurses', '5.9'),
-#   ('OpenSSL', '1.0.1f'),  # OS dependency should be preferred for security reasons
+    #   ('OpenSSL', '1.0.1f'),  # OS dependency should be preferred for security reasons
 ]
 
 osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-intel-2015a.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-intel-2015a.eb
index bcc80770f8f66f12972c6de62e95d72a7e4f6db6..a68ef18929ba692311f25818eb3b4ee67222dba0 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.3-intel-2015a.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-intel-2015a.eb
@@ -19,7 +19,7 @@ dependencies = [
     ('zlib', '1.2.8'),
     ('libreadline', '6.2'),
     ('ncurses', '5.9'),
-#   ('OpenSSL', '1.0.1f'),  # OS dependency should be preferred for security reasons
+    #   ('OpenSSL', '1.0.1f'),  # OS dependency should be preferred for security reasons
 ]
 
 osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-iomkl-4.6.13.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-iomkl-4.6.13.eb
index 262801c6c11f6379519725f54257f4cd766edc65..b36520e7e8afa0caf010275b25d8ff45e39b3f9c 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.3-iomkl-4.6.13.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-iomkl-4.6.13.eb
@@ -21,7 +21,7 @@ dependencies = [
     ('zlib', '1.2.7'),
     ('libreadline', '6.2'),
     ('ncurses', '5.9'),
-#   ('OpenSSL', '1.0.1f'),  # OS dependency should be preferred for security reasons
+    #   ('OpenSSL', '1.0.1f'),  # OS dependency should be preferred for security reasons
 ]
 
 osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-iqacml-3.7.3.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-iqacml-3.7.3.eb
index 7713f868794252a35e8ed9367d982ca37a95195f..3806ea6dd78b1b3109b836f1bb8a9c3e28317f9a 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.3-iqacml-3.7.3.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-iqacml-3.7.3.eb
@@ -22,7 +22,7 @@ dependencies = [
     ('libreadline', '6.2'),
     ('ncurses', '5.9'),
     ('CBLAS', '20110120'),
-#   ('OpenSSL', '1.0.1f'),  # OS dependency should be preferred for security reasons
+    #   ('OpenSSL', '1.0.1f'),  # OS dependency should be preferred for security reasons
 ]
 
 osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.5-goalf-1.5.12-no-OFED.eb b/easybuild/easyconfigs/p/Python/Python-2.7.5-goalf-1.5.12-no-OFED.eb
index 0acac864f5d5fbbd256bc084da5ef05aeac5eecd..e8290ac41a316a88efeea8c17847b1901f087e3c 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.5-goalf-1.5.12-no-OFED.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.5-goalf-1.5.12-no-OFED.eb
@@ -19,7 +19,7 @@ dependencies = [
     ('zlib', '1.2.8'),
     ('libreadline', '6.2'),
     ('ncurses', '5.9'),
-#   ('OpenSSL', '1.0.1f'),  # OS dependency should be preferred for security reasons
+    #   ('OpenSSL', '1.0.1f'),  # OS dependency should be preferred for security reasons
 ]
 
 osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.5-goolf-1.4.10.eb b/easybuild/easyconfigs/p/Python/Python-2.7.5-goolf-1.4.10.eb
index b8e12d524c621f9a7c70eeb390ce3a616a008923..ed2a7a57302cfb0710fc5dc8001746f247c845f5 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.5-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.5-goolf-1.4.10.eb
@@ -19,7 +19,7 @@ dependencies = [
     ('zlib', '1.2.8'),
     ('libreadline', '6.2'),
     ('ncurses', '5.9'),
-#   ('OpenSSL', '1.0.1f'),  # OS dependency should be preferred for security reasons
+    #   ('OpenSSL', '1.0.1f'),  # OS dependency should be preferred for security reasons
 ]
 
 osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-4.1.13.eb b/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-4.1.13.eb
index 9fda7777e647ec648efc6a1847c7c6b49aeec6ee..45b1ca6a64852bde6f903be6922666582a7f6781 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-4.1.13.eb
@@ -22,7 +22,7 @@ dependencies = [
     ('zlib', '1.2.8'),
     ('libreadline', '6.2'),
     ('ncurses', '5.9'),
-#   ('OpenSSL', '1.0.1f'),  # OS dependency should be preferred for security reasons
+    #   ('OpenSSL', '1.0.1f'),  # OS dependency should be preferred for security reasons
 ]
 
 osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-5.3.0.eb b/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-5.3.0.eb
index 6f7edf431ee89ec321ee2d9fe7e68be3451ffc67..33dce6f6ca70c4d163a55494fbf6981104a7e7e4 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-5.3.0.eb
@@ -22,7 +22,7 @@ dependencies = [
     ('zlib', '1.2.8'),
     ('libreadline', '6.2'),
     ('ncurses', '5.9'),
-#   ('OpenSSL', '1.0.1f'),  # OS dependency should be preferred for security reasons
+    #   ('OpenSSL', '1.0.1f'),  # OS dependency should be preferred for security reasons
 ]
 
 osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-5.5.0.eb b/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-5.5.0.eb
index 3c2a47e51e8e3f9beb52133219152d1cf1e89fad..0a01b973a0d04f9d8e749f177468080d522ea9de 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-5.5.0.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.5-ictce-5.5.0.eb
@@ -22,7 +22,7 @@ dependencies = [
     ('zlib', '1.2.8'),
     ('libreadline', '6.2'),
     ('ncurses', '5.9'),
-#   ('OpenSSL', '1.0.1f'),  # OS dependency should be preferred for security reasons
+    #   ('OpenSSL', '1.0.1f'),  # OS dependency should be preferred for security reasons
 ]
 
 osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.5-iqacml-3.7.3.eb b/easybuild/easyconfigs/p/Python/Python-2.7.5-iqacml-3.7.3.eb
index c8797b36e9be938d5a2c3dd5973165470445b453..f5d6db6b40e4e6eb5965e35ca940e59d79e76e00 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.5-iqacml-3.7.3.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.5-iqacml-3.7.3.eb
@@ -23,7 +23,7 @@ dependencies = [
     ('libreadline', '6.2'),
     ('ncurses', '5.9'),
     ('CBLAS', '20110120'),
-#   ('OpenSSL', '1.0.1f'),  # OS dependency should be preferred for security reasons
+    #   ('OpenSSL', '1.0.1f'),  # OS dependency should be preferred for security reasons
 ]
 
 osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.6-goolf-1.4.10.eb b/easybuild/easyconfigs/p/Python/Python-2.7.6-goolf-1.4.10.eb
index de11eaf35665adcb3e69194ac8576d31c5301c91..bccfcbf0c220159d4884b052b8db0902e5103c5c 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.6-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.6-goolf-1.4.10.eb
@@ -19,7 +19,7 @@ dependencies = [
     ('zlib', '1.2.7'),
     ('libreadline', '6.2'),
     ('ncurses', '5.9'),
-#   ('OpenSSL', '1.0.1f'),  # OS dependency should be preferred for security reasons
+    #   ('OpenSSL', '1.0.1f'),  # OS dependency should be preferred for security reasons
 ]
 
 osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.6-ictce-4.1.13.eb b/easybuild/easyconfigs/p/Python/Python-2.7.6-ictce-4.1.13.eb
index b8f2f71c1298a2e06a92f29c7f861226b4c8ffce..146417325f9f850b95a15e73de92e783b47a9cb3 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.6-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.6-ictce-4.1.13.eb
@@ -22,7 +22,7 @@ dependencies = [
     ('zlib', '1.2.7'),
     ('libreadline', '6.2'),
     ('ncurses', '5.9'),
-#   ('OpenSSL', '1.0.1f'),  # OS dependency should be preferred for security reasons
+    #   ('OpenSSL', '1.0.1f'),  # OS dependency should be preferred for security reasons
 ]
 
 osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.6-ictce-5.5.0.eb b/easybuild/easyconfigs/p/Python/Python-2.7.6-ictce-5.5.0.eb
index be1053a62d683f0385756f0b3478ca21b2bbf9a6..a51d51c98601d8e4aa4dde8345eadbd9f37cc522 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.6-ictce-5.5.0.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.6-ictce-5.5.0.eb
@@ -22,7 +22,7 @@ dependencies = [
     ('zlib', '1.2.7'),
     ('libreadline', '6.2'),
     ('ncurses', '5.9'),
-#   ('OpenSSL', '1.0.1f'),  # OS dependency should be preferred for security reasons
+    #   ('OpenSSL', '1.0.1f'),  # OS dependency should be preferred for security reasons
 ]
 
 osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.8-foss-2014b.eb b/easybuild/easyconfigs/p/Python/Python-2.7.8-foss-2014b.eb
index caf05b2cc7ffaef59b1e10abb4068850df96ce40..16590efbbd1082d005bcc7366f17bb28f2fb5612 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.8-foss-2014b.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.8-foss-2014b.eb
@@ -19,7 +19,7 @@ dependencies = [
     ('zlib', '1.2.8'),
     ('libreadline', '6.3'),
     ('ncurses', '5.9'),
-#   ('OpenSSL', '1.0.1g'),  # OS dependency should be preferred for security reasons
+    #   ('OpenSSL', '1.0.1g'),  # OS dependency should be preferred for security reasons
 ]
 
 osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.8-goolf-1.5.14.eb b/easybuild/easyconfigs/p/Python/Python-2.7.8-goolf-1.5.14.eb
index 5c19bcd953243787c7508def9cf5a974e6dca284..c8491023d824a0fcc9f8df18b857d9996fc9d82a 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.8-goolf-1.5.14.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.8-goolf-1.5.14.eb
@@ -22,7 +22,7 @@ dependencies = [
     ('zlib', '1.2.8'),
     ('libreadline', '6.3'),
     ('ncurses', '5.9'),
-#   ('OpenSSL', '1.0.1g'),  # OS dependency should be preferred for security reasons
+    #   ('OpenSSL', '1.0.1g'),  # OS dependency should be preferred for security reasons
 ]
 
 osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.8-ictce-7.1.2.eb b/easybuild/easyconfigs/p/Python/Python-2.7.8-ictce-7.1.2.eb
index f1ec579fbec9c3a7b1921495625b9a9fe82a8768..bcf88e98c962784d043c09e37df6aabfb2cadcfb 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.8-ictce-7.1.2.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.8-ictce-7.1.2.eb
@@ -25,7 +25,7 @@ dependencies = [
     ('zlib', '1.2.8'),
     ('libreadline', '6.3'),
     ('ncurses', '5.9'),
-#   ('OpenSSL', '1.0.1g'),  # OS dependency should be preferred for security reasons
+    #   ('OpenSSL', '1.0.1g'),  # OS dependency should be preferred for security reasons
 ]
 
 osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.8-intel-2014.06.eb b/easybuild/easyconfigs/p/Python/Python-2.7.8-intel-2014.06.eb
index b6208992739be2617df8f408dead087b982bb260..dfe5979c7c5be91e27fee21819b96e4ba29932b4 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.8-intel-2014.06.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.8-intel-2014.06.eb
@@ -22,7 +22,7 @@ dependencies = [
     ('zlib', '1.2.8'),
     ('libreadline', '6.3'),
     ('ncurses', '5.9'),
-#   ('OpenSSL', '1.0.1g'),  # OS dependency should be preferred for security reasons
+    #   ('OpenSSL', '1.0.1g'),  # OS dependency should be preferred for security reasons
 ]
 
 osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.8-intel-2014b.eb b/easybuild/easyconfigs/p/Python/Python-2.7.8-intel-2014b.eb
index 1ae3ec0c5f68a8a57c9dece5f47ad8fbc7a256db..54121e1a6fb6163021e9322e44f936839b68a2fa 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.8-intel-2014b.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.8-intel-2014b.eb
@@ -22,7 +22,7 @@ dependencies = [
     ('zlib', '1.2.8'),
     ('libreadline', '6.3'),
     ('ncurses', '5.9'),
-#   ('OpenSSL', '1.0.1g'),  # OS dependency should be preferred for security reasons
+    #   ('OpenSSL', '1.0.1g'),  # OS dependency should be preferred for security reasons
 ]
 
 osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.8-intel-2015a.eb b/easybuild/easyconfigs/p/Python/Python-2.7.8-intel-2015a.eb
index 60923e701c5052fa8a481553de1671add9450089..012b08cef627b9559ee0ebc3552e7fc9b8ebc540 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.8-intel-2015a.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.8-intel-2015a.eb
@@ -22,8 +22,8 @@ dependencies = [
     ('zlib', '1.2.8'),
     ('libreadline', '6.3'),
     ('ncurses', '5.9'),
-#   ('OpenSSL', '1.0.1g'),  # OS dependency should be preferred if the os version is more recent then this version, it's
-#   nice to have an up to date openssl for security reasons
+    #   ('OpenSSL', '1.0.1g'),  # OS dependency should be preferred if the os version is more recent then this version, it's
+    #   nice to have an up to date openssl for security reasons
 ]
 
 # order is important!
@@ -40,9 +40,7 @@ exts_list = [
     }),
     ('numpy', numpyversion, {
         'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numpyversion, 'download')],
-        'patches': [
-            'numpy-1.8.0-mkl.patch', # % numpyversion,
-        ],
+        'patches': ['numpy-1.8.0-mkl.patch'],
     }),
     ('scipy', scipyversion, {
         'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scipyversion, 'download')],
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.9-GCC-4.9.2-bare.eb b/easybuild/easyconfigs/p/Python/Python-2.7.9-GCC-4.9.2-bare.eb
index 7f438347a5a4904fab5f7963107845601804365c..3b6c965221828caceed13fe34a8a081458be763a 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.9-GCC-4.9.2-bare.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.9-GCC-4.9.2-bare.eb
@@ -19,8 +19,8 @@ dependencies = [
     ('ncurses', '5.9'),
     ('SQLite', '3.8.8.1'),
     ('Tk', '8.6.3', '-no-X11'),
-#   ('OpenSSL', '1.0.1k'),  # OS dependency should be preferred if the os version is more recent then this version, it's
-#   nice to have an up to date openssl for security reasons
+    #   ('OpenSSL', '1.0.1k'),  # OS dependency should be preferred if the os version is more recent then this version, it's
+    #   nice to have an up to date openssl for security reasons
 ]
 
 osdependencies = [('openssl-devel', 'libssl-dev')]
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.9-foss-2015.05.eb b/easybuild/easyconfigs/p/Python/Python-2.7.9-foss-2015.05.eb
index abb705a349eff8e55418d662e9496d829061fe0a..75386ccc4ae440fdd476204f4c3bac846ed86504 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.9-foss-2015.05.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.9-foss-2015.05.eb
@@ -21,8 +21,8 @@ dependencies = [
     ('ncurses', '5.9'),
     ('SQLite', '3.8.8.1'),
     ('Tk', '8.6.3', '-no-X11'),
-#   ('OpenSSL', '1.0.1k'),  # OS dependency should be preferred if the os version is more recent then this version, it's
-#   nice to have an up to date openssl for security reasons
+    #   ('OpenSSL', '1.0.1k'),  # OS dependency should be preferred if the os version is more recent then this version, it's
+    #   nice to have an up to date openssl for security reasons
 ]
 
 osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.9-foss-2015a-bare.eb b/easybuild/easyconfigs/p/Python/Python-2.7.9-foss-2015a-bare.eb
index dc26dc666bfb39985b0054631347a2f9838c65f7..a04b4992d3845721e9864bf8d50cb8c820db2ecb 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.9-foss-2015a-bare.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.9-foss-2015a-bare.eb
@@ -19,8 +19,8 @@ dependencies = [
     ('ncurses', '5.9'),
     ('SQLite', '3.8.8.1'),
     ('Tk', '8.6.3', '-no-X11'),
-#   ('OpenSSL', '1.0.1k'),  # OS dependency should be preferred if the os version is more recent then this version, it's
-#   nice to have an up to date openssl for security reasons
+    #   ('OpenSSL', '1.0.1k'),  # OS dependency should be preferred if the os version is more recent then this version, it's
+    #   nice to have an up to date openssl for security reasons
 ]
 
 osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.9-foss-2015a.eb b/easybuild/easyconfigs/p/Python/Python-2.7.9-foss-2015a.eb
index bb297e5eb8f68b2d2e970f14b84b1ec274cdb0f8..4d8258d2814dbe834747b4bb981629fdccda846c 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.9-foss-2015a.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.9-foss-2015a.eb
@@ -21,8 +21,8 @@ dependencies = [
     ('ncurses', '5.9'),
     ('SQLite', '3.8.8.1'),
     ('Tk', '8.6.3', '-no-X11'),
-#   ('OpenSSL', '1.0.1k'),  # OS dependency should be preferred if the os version is more recent then this version, it's
-#   nice to have an up to date openssl for security reasons
+    #   ('OpenSSL', '1.0.1k'),  # OS dependency should be preferred if the os version is more recent then this version, it's
+    #   nice to have an up to date openssl for security reasons
 ]
 
 osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.9-gompi-1.5.16-bare.eb b/easybuild/easyconfigs/p/Python/Python-2.7.9-gompi-1.5.16-bare.eb
index ad2c37f79adb5bd9c619d6a67fe1f88a565f3bbb..e8eb88c738b8515c0acdd92406529736f5761d62 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.9-gompi-1.5.16-bare.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.9-gompi-1.5.16-bare.eb
@@ -18,8 +18,8 @@ dependencies = [
     ('ncurses', '5.9'),
     ('SQLite', '3.8.8.1'),
     ('Tk', '8.6.3', '-no-X11'),
-#   ('OpenSSL', '1.0.1k'),  # OS dependency should be preferred if the os version is more recent then this version, it's
-#   nice to have an up to date openssl for security reasons
+    #   ('OpenSSL', '1.0.1k'),  # OS dependency should be preferred if the os version is more recent then this version, it's
+    #   nice to have an up to date openssl for security reasons
 ]
 
 osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.9-goolf-1.5.14.eb b/easybuild/easyconfigs/p/Python/Python-2.7.9-goolf-1.5.14.eb
index 27281d943cfd6eb641909c9b57adfafa60f61f65..7739e8b255f28286877c996601b1401b193d72bf 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.9-goolf-1.5.14.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.9-goolf-1.5.14.eb
@@ -21,8 +21,8 @@ dependencies = [
     ('ncurses', '5.9'),
     ('SQLite', '3.8.8.1'),
     ('Tk', '8.6.3', '-no-X11'),
-#   ('OpenSSL', '1.0.1k'),  # OS dependency should be preferred if the os version is more recent then this version, it's
-#   nice to have an up to date openssl for security reasons
+    #   ('OpenSSL', '1.0.1k'),  # OS dependency should be preferred if the os version is more recent then this version, it's
+    #   nice to have an up to date openssl for security reasons
 ]
 
 osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.9-goolf-1.7.20.eb b/easybuild/easyconfigs/p/Python/Python-2.7.9-goolf-1.7.20.eb
index c011298dc9c62f9feb9698ce0bfd77041e9b7a7f..41e6d0cc85a0022e8ea63d0e19670a50af085be3 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.9-goolf-1.7.20.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.9-goolf-1.7.20.eb
@@ -22,7 +22,7 @@ dependencies = [
     ('SQLite', '3.8.8.1'),
     ('Tk', '8.6.3', '-no-X11'),
     #('OpenSSL', '1.0.1k'),  # OS dependency should be preferred if the os version is more recent then this version, it's
-#   nice to have an up to date openssl for security reasons
+    #   nice to have an up to date openssl for security reasons
 ]
 
 osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.9-intel-2015a-bare.eb b/easybuild/easyconfigs/p/Python/Python-2.7.9-intel-2015a-bare.eb
index d6a4eb1b3cb4883decd61523e54d63b252e278d8..f327891d4e89bb2eac7544a33b0072fb19e7b9ae 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.9-intel-2015a-bare.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.9-intel-2015a-bare.eb
@@ -19,8 +19,8 @@ dependencies = [
     ('ncurses', '5.9'),
     ('SQLite', '3.8.8.1'),
     ('Tk', '8.6.3', '-no-X11'),
-#   ('OpenSSL', '1.0.1k'),  # OS dependency should be preferred if the os version is more recent then this version, it's
-#   nice to have an up to date openssl for security reasons
+    #   ('OpenSSL', '1.0.1k'),  # OS dependency should be preferred if the os version is more recent then this version, it's
+    #   nice to have an up to date openssl for security reasons
 ]
 
 osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.9-intel-2015a.eb b/easybuild/easyconfigs/p/Python/Python-2.7.9-intel-2015a.eb
index 2c04d1e9a7f0df30f246722274fcc90c2ef4f67a..188046b96972413bb51af944e7b138d6b414e563 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.9-intel-2015a.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.9-intel-2015a.eb
@@ -21,8 +21,8 @@ dependencies = [
     ('ncurses', '5.9'),
     ('SQLite', '3.8.8.1'),
     ('Tk', '8.6.3', '-no-X11'),
-#   ('OpenSSL', '1.0.1k'),  # OS dependency should be preferred if the os version is more recent then this version, it's
-#   nice to have an up to date openssl for security reasons
+    #   ('OpenSSL', '1.0.1k'),  # OS dependency should be preferred if the os version is more recent then this version, it's
+    #   nice to have an up to date openssl for security reasons
 ]
 
 osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
@@ -41,9 +41,7 @@ exts_list = [
     }),
     ('numpy', numpyversion, {
         'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numpyversion, 'download')],
-        'patches': [
-            'numpy-1.8.0-mkl.patch', # % numpyversion,
-        ],
+        'patches': ['numpy-1.8.0-mkl.patch'],
     }),
     ('scipy', scipyversion, {
         'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scipyversion, 'download')],
diff --git a/easybuild/easyconfigs/p/Python/Python-3.2.3-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/p/Python/Python-3.2.3-goalf-1.1.0-no-OFED.eb
index 151d6f90e79532b4162e75eb439c427e47d6baba..9282981b3f706b4a8a9172b3f5568c45db80f26d 100644
--- a/easybuild/easyconfigs/p/Python/Python-3.2.3-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/p/Python/Python-3.2.3-goalf-1.1.0-no-OFED.eb
@@ -19,7 +19,7 @@ dependencies = [
     ('zlib', '1.2.7'),
     ('libreadline', '6.2'),
     ('ncurses', '5.9'),
-#   ('OpenSSL', '1.0.1f'),  # OS dependency should be preferred for security reasons
+    #   ('OpenSSL', '1.0.1f'),  # OS dependency should be preferred for security reasons
 ]
 
 osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
diff --git a/easybuild/easyconfigs/p/Python/Python-3.2.3-goolf-1.4.10.eb b/easybuild/easyconfigs/p/Python/Python-3.2.3-goolf-1.4.10.eb
index c2247793ab8bc254295ee81766ac85a415f80de0..98e26ec9ef9e2640d46dee45dde04b8860cec7a9 100644
--- a/easybuild/easyconfigs/p/Python/Python-3.2.3-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/p/Python/Python-3.2.3-goolf-1.4.10.eb
@@ -19,7 +19,7 @@ dependencies = [
     ('zlib', '1.2.7'),
     ('libreadline', '6.2'),
     ('ncurses', '5.9'),
-#   ('OpenSSL', '1.0.1f'),  # OS dependency should be preferred for security reasons
+    #   ('OpenSSL', '1.0.1f'),  # OS dependency should be preferred for security reasons
 ]
 
 osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
diff --git a/easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-4.0.6.eb b/easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-4.0.6.eb
index 77a4ae2161af48e9fb0110de9e668031f9eda6b8..b110143efd89ed1e7c341ca56f0d529cf1647d6d 100644
--- a/easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-4.0.6.eb
@@ -21,7 +21,7 @@ dependencies = [
     ('zlib', '1.2.7'),
     ('libreadline', '6.2'),
     ('ncurses', '5.9'),
-#   ('OpenSSL', '1.0.1f'),  # OS dependency should be preferred for security reasons
+    #   ('OpenSSL', '1.0.1f'),  # OS dependency should be preferred for security reasons
 ]
 
 osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
diff --git a/easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-5.3.0.eb b/easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-5.3.0.eb
index 24ea958ab00cbced932585b2f7b437914fc75c11..4bc546cccb224feaeff993eaddb52f7136206643 100644
--- a/easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/p/Python/Python-3.2.3-ictce-5.3.0.eb
@@ -19,7 +19,7 @@ dependencies = [
     ('zlib', '1.2.7'),
     ('libreadline', '6.2'),
     ('ncurses', '5.9'),
-#   ('OpenSSL', '1.0.1f'),  # OS dependency should be preferred for security reasons
+    #   ('OpenSSL', '1.0.1f'),  # OS dependency should be preferred for security reasons
 ]
 
 osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
diff --git a/easybuild/easyconfigs/p/Python/Python-3.3.2-goolf-1.4.10.eb b/easybuild/easyconfigs/p/Python/Python-3.3.2-goolf-1.4.10.eb
index f23e383d176628ba6472fa95773734311b7feb2e..0dc65b97cafb45b9b359fe8d356bd8ac1cd77765 100644
--- a/easybuild/easyconfigs/p/Python/Python-3.3.2-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/p/Python/Python-3.3.2-goolf-1.4.10.eb
@@ -19,7 +19,7 @@ dependencies = [
     ('zlib', '1.2.8'),
     ('libreadline', '6.2'),
     ('ncurses', '5.9'),
-#   ('OpenSSL', '1.0.1f'),  # OS dependency should be preferred for security reasons
+    #   ('OpenSSL', '1.0.1f'),  # OS dependency should be preferred for security reasons
 ]
 
 osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
diff --git a/easybuild/easyconfigs/p/Python/Python-3.3.2-ictce-4.1.13.eb b/easybuild/easyconfigs/p/Python/Python-3.3.2-ictce-4.1.13.eb
index 28d140c742f4d100facb9394ce8d32bbe5f444bd..24ae167fb42053856e72be5b5b43b25bb7d18d38 100644
--- a/easybuild/easyconfigs/p/Python/Python-3.3.2-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/p/Python/Python-3.3.2-ictce-4.1.13.eb
@@ -21,7 +21,7 @@ dependencies = [
     ('zlib', '1.2.8'),
     ('libreadline', '6.2'),
     ('ncurses', '5.9'),
-#   ('OpenSSL', '1.0.1f'),  # OS dependency should be preferred for security reasons
+    #   ('OpenSSL', '1.0.1f'),  # OS dependency should be preferred for security reasons
 ]
 
 osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
diff --git a/easybuild/easyconfigs/p/Python/Python-3.3.2-ictce-5.3.0.eb b/easybuild/easyconfigs/p/Python/Python-3.3.2-ictce-5.3.0.eb
index a66a2c142af3ca2a7e7069c0d3b79f8116a6ac83..97e6c04ce768b4701ae26d6d4780bdc15cf123ee 100644
--- a/easybuild/easyconfigs/p/Python/Python-3.3.2-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/p/Python/Python-3.3.2-ictce-5.3.0.eb
@@ -21,7 +21,7 @@ dependencies = [
     ('zlib', '1.2.8'),
     ('libreadline', '6.2'),
     ('ncurses', '5.9'),
-#   ('OpenSSL', '1.0.1f'),  # OS dependency should be preferred for security reasons
+    #   ('OpenSSL', '1.0.1f'),  # OS dependency should be preferred for security reasons
 ]
 
 osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
diff --git a/easybuild/easyconfigs/p/Python/Python-3.4.1-intel-2014b.eb b/easybuild/easyconfigs/p/Python/Python-3.4.1-intel-2014b.eb
index f553cd209e2b62865e95a0314c078b1c4c40d5f1..66630e998024756b4c660470994c00aa39f69aa8 100644
--- a/easybuild/easyconfigs/p/Python/Python-3.4.1-intel-2014b.eb
+++ b/easybuild/easyconfigs/p/Python/Python-3.4.1-intel-2014b.eb
@@ -22,7 +22,7 @@ dependencies = [
     ('zlib', '1.2.8'),
     ('libreadline', '6.3'),
     ('ncurses', '5.9'),
-#   ('OpenSSL', '1.0.1g'),  # OS dependency should be preferred for security reasons
+    #   ('OpenSSL', '1.0.1g'),  # OS dependency should be preferred for security reasons
 ]
 
 osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
diff --git a/easybuild/easyconfigs/p/Python/Python-3.4.1-intel-2015a.eb b/easybuild/easyconfigs/p/Python/Python-3.4.1-intel-2015a.eb
index cdfe46f05e2b46625fa754821c996b64ce64de3c..d93f95e46a11c395573086dbc367b1b4ae459b4e 100644
--- a/easybuild/easyconfigs/p/Python/Python-3.4.1-intel-2015a.eb
+++ b/easybuild/easyconfigs/p/Python/Python-3.4.1-intel-2015a.eb
@@ -22,7 +22,7 @@ dependencies = [
     ('zlib', '1.2.8'),
     ('libreadline', '6.3'),
     ('ncurses', '5.9'),
-#   ('OpenSSL', '1.0.1g'),  # OS dependency should be preferred for security reasons
+    #   ('OpenSSL', '1.0.1g'),  # OS dependency should be preferred for security reasons
 ]
 
 osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
diff --git a/easybuild/easyconfigs/p/Python/Python-3.4.3-intel-2015a.eb b/easybuild/easyconfigs/p/Python/Python-3.4.3-intel-2015a.eb
index dd4b3e999bba669bbfcd22fe1a3204f90702ef21..f8a3851092f9de828685b73cb6076653b39571ab 100644
--- a/easybuild/easyconfigs/p/Python/Python-3.4.3-intel-2015a.eb
+++ b/easybuild/easyconfigs/p/Python/Python-3.4.3-intel-2015a.eb
@@ -19,8 +19,8 @@ dependencies = [
     ('zlib', '1.2.8'),
     ('libreadline', '6.3'),
     ('ncurses', '5.9'),
-#   ('OpenSSL', '1.0.1m'),  # OS dependency should be preferred if the os version is more recent then this version, it's
-#   nice to have an up to date openssl for security reasons
+    #   ('OpenSSL', '1.0.1m'),  # OS dependency should be preferred if the os version is more recent then this version, it's
+    #   nice to have an up to date openssl for security reasons
 ]
 
 osdependencies = [('openssl-devel', 'libssl-dev')]
@@ -39,9 +39,7 @@ exts_list = [
     }),
     ('numpy', numpyversion, {
         'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numpyversion, 'download')],
-        'patches': [
-            'numpy-1.8.0-mkl.patch', # % numpyversion,
-        ],
+        'patches': ['numpy-1.8.0-mkl.patch'],
     }),
     ('scipy', scipyversion, {
         'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scipyversion, 'download')],
@@ -97,7 +95,7 @@ exts_list = [
     }),
     ('paramiko', '1.15.2', {
         'source_urls': ['https://pypi.python.org/packages/source/p/paramiko/'],
-   }),
+    }),
     ('pyparsing', '2.0.3', {
         'source_urls': ['https://pypi.python.org/packages/source/p/pyparsing/'],
     }),
diff --git a/easybuild/easyconfigs/p/Python/Python-3.5.0-intel-2015b.eb b/easybuild/easyconfigs/p/Python/Python-3.5.0-intel-2015b.eb
index f6409a5d49a3618137c2e1a48aee18b33902967d..ae86e7bce7760f87ac06bac560da523691b9d3bf 100644
--- a/easybuild/easyconfigs/p/Python/Python-3.5.0-intel-2015b.eb
+++ b/easybuild/easyconfigs/p/Python/Python-3.5.0-intel-2015b.eb
@@ -19,8 +19,8 @@ dependencies = [
     ('zlib', '1.2.8'),
     ('libreadline', '6.3'),
     ('ncurses', '5.9'),
-#   ('OpenSSL', '1.0.1p'),  # OS dependency should be preferred if the os version is more recent then this version, it's
-#   nice to have an up to date openssl for security reasons
+    #   ('OpenSSL', '1.0.1p'),  # OS dependency should be preferred if the os version is more recent then this version, it's
+    #   nice to have an up to date openssl for security reasons
 ]
 
 osdependencies = [('openssl-devel', 'libssl-dev')]
@@ -39,9 +39,7 @@ exts_list = [
     }),
     ('numpy', numpyversion, {
         'source_urls': ['https://pypi.python.org/packages/source/n/numpy/'],
-        'patches': [
-            'numpy-1.8.0-mkl.patch', # % numpyversion,
-        ],
+        'patches': ['numpy-1.8.0-mkl.patch'],
     }),
     ('scipy', scipyversion, {
         'source_urls': ['https://pypi.python.org/packages/source/s/scipy/'],
@@ -97,7 +95,7 @@ exts_list = [
     }),
     ('paramiko', '1.15.2', {
         'source_urls': ['https://pypi.python.org/packages/source/p/paramiko/'],
-   }),
+    }),
     ('pyparsing', '2.0.3', {
         'source_urls': ['https://pypi.python.org/packages/source/p/pyparsing/'],
     }),
diff --git a/easybuild/easyconfigs/p/Python/Python-3.5.1-intel-2016a.eb b/easybuild/easyconfigs/p/Python/Python-3.5.1-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..e610aff618e6c81daaed7da080f81490faf4af7b
--- /dev/null
+++ b/easybuild/easyconfigs/p/Python/Python-3.5.1-intel-2016a.eb
@@ -0,0 +1,113 @@
+name = 'Python'
+version = '3.5.1'
+
+homepage = 'http://python.org/'
+description = "Python is a programming language that lets you work more quickly and integrate your systems more effectively."
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
+
+numpyversion = '1.10.4'
+scipyversion = '0.17.0'
+
+source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
+sources = [SOURCE_TGZ]
+
+# python needs bzip2 to build the bz2 package
+dependencies = [
+    ('bzip2', '1.0.6'),
+    ('zlib', '1.2.8'),
+    ('libreadline', '6.3'),
+    ('ncurses', '6.0'),
+#   ('OpenSSL', '1.0.1q'),  # OS dependency should be preferred if the os version is more recent then this version, it's
+#   nice to have an up to date openssl for security reasons
+]
+
+osdependencies = [('openssl-devel', 'libssl-dev')]
+
+# order is important!
+# package versions updated Feb 25th 2016
+exts_list = [
+    ('setuptools', '20.1.1', {
+        'source_urls': ['https://pypi.python.org/packages/source/s/setuptools/'],
+    }),
+    ('pip', '8.0.2', {
+        'source_urls': ['https://pypi.python.org/packages/source/p/pip/'],
+    }),
+    ('nose', '1.3.7', {
+        'source_urls': ['https://pypi.python.org/packages/source/n/nose/'],
+    }),
+    ('numpy', numpyversion, {
+        'source_urls': ['https://pypi.python.org/packages/source/n/numpy/'],
+        'patches': [
+            'numpy-1.8.0-mkl.patch',
+            'numpy-%s-sse42.patch' % numpyversion,
+        ],
+    }),
+    ('scipy', scipyversion, {
+        'source_urls': ['https://pypi.python.org/packages/source/s/scipy/'],
+    }),
+    ('blist', '1.3.6', {
+        'source_urls': ['https://pypi.python.org/packages/source/b/blist/'],
+    }),
+    ('mpi4py', '2.0.0', {
+        'source_urls': ['http://bitbucket.org/mpi4py/mpi4py/downloads/'],
+    }),
+    ('paycheck', '1.0.2', {
+        'source_urls': ['https://pypi.python.org/packages/source/p/paycheck/'],
+        'patches': [
+            'paycheck-1.0.2_setup-open-README-utf8.patch',
+        ],
+    }),
+    ('pbr', '1.8.1', {
+        'source_urls': ['https://pypi.python.org/packages/source/p/pbr/'],
+    }),
+    ('lockfile', '0.12.2', {
+        'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'],
+    }),
+    ('Cython', '0.23.4', {
+        'source_urls': ['http://www.cython.org/release/'],
+    }),
+    ('six', '1.10.0', {
+        'source_urls': ['https://pypi.python.org/packages/source/s/six/'],
+    }),
+    ('dateutil', '2.4.2', {
+        'source_tmpl': 'python-%(name)s-%(version)s.tar.gz',
+        'source_urls': ['https://pypi.python.org/packages/source/p/python-dateutil/'],
+    }),
+    ('deap', '1.0.2', {
+        'source_tmpl': '%(name)s-%(version)s.post2.tar.gz',
+        'source_urls': ['https://pypi.python.org/packages/source/d/deap/'],
+        'patches': [
+            'deap-1.0.2_setup-open-README-utf8.patch',
+        ],
+    }),
+    ('decorator', '4.0.9', {
+        'source_urls': ['https://pypi.python.org/packages/source/d/decorator/'],
+    }),
+    ('arff', '2.1.0', {
+        'source_tmpl': 'liac-%(name)s-%(version)s.zip',
+        'source_urls': ['https://pypi.python.org/packages/source/l/liac-arff/'],
+    }),
+    ('pycrypto', '2.6.1', {
+        'modulename': 'Crypto',
+        'source_urls': ['http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/'],
+    }),
+    ('ecdsa', '0.13', {
+        'source_urls': ['https://pypi.python.org/packages/source/e/ecdsa/'],
+    }),
+    ('paramiko', '1.16.0', {
+        'source_urls': ['https://pypi.python.org/packages/source/p/paramiko/'],
+   }),
+    ('pyparsing', '2.1.0', {
+        'source_urls': ['https://pypi.python.org/packages/source/p/pyparsing/'],
+    }),
+    ('netifaces', '0.10.4', {
+        'source_urls': ['https://pypi.python.org/packages/source/n/netifaces'],
+    }),
+    ('netaddr', '0.7.18', {
+        'source_urls': ['https://pypi.python.org/packages/source/n/netaddr'],
+    }),
+]
+
+moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/p/Python/numpy-1.10.1-sse42.patch b/easybuild/easyconfigs/p/Python/numpy-1.10.1-sse42.patch
new file mode 100644
index 0000000000000000000000000000000000000000..60cdd9673149e148738b4937babc6eff138f2645
--- /dev/null
+++ b/easybuild/easyconfigs/p/Python/numpy-1.10.1-sse42.patch
@@ -0,0 +1,25 @@
+#Remove hard coded -xSSE4.2 compilation flag for Intel compilers (add the usual -xHOST)
+#compilation would fail on non-SSE4.2 CPUs, and for further CPUs/compilers it would restrict the generated code to SSE4.2
+# February 19th, 2016 by B. Hajgato - Free University Brussels (VUB)
+--- numpy/distutils/intelccompiler.py.orig	2015-10-12 16:29:01.000000000 +0200
++++ numpy/distutils/intelccompiler.py	2016-02-23 11:31:50.350422787 +0100
+@@ -49,7 +49,7 @@
+     def __init__(self, verbose=0, dry_run=0, force=0):
+         UnixCCompiler.__init__(self, verbose, dry_run, force)
+         self.cc_exe = ('icc -m64 -fPIC -fp-model strict -O3 '
+-                       '-fomit-frame-pointer -openmp -xSSE4.2')
++                       '-fomit-frame-pointer -openmp -xHOST')
+         compiler = self.cc_exe
+         self.set_executables(compiler=compiler,
+                              compiler_so=compiler,
+--- numpy/distutils/fcompiler/intel.py.orig	2015-10-12 16:29:01.000000000 +0200
++++ numpy/distutils/fcompiler/intel.py	2016-02-23 11:31:50.350422787 +0100
+@@ -123,7 +123,7 @@
+         return ['-openmp -fp-model strict']
+ 
+     def get_flags_arch(self):
+-        return ['-xSSE4.2']
++        return ['-xHOST']
+ 
+ # Is there no difference in the version string between the above compilers
+ # and the Visual compilers?
diff --git a/easybuild/easyconfigs/p/Python/numpy-1.10.4-sse42.patch b/easybuild/easyconfigs/p/Python/numpy-1.10.4-sse42.patch
new file mode 100644
index 0000000000000000000000000000000000000000..75ffeaa0d5939995de089410a1dd77d8bce4e74c
--- /dev/null
+++ b/easybuild/easyconfigs/p/Python/numpy-1.10.4-sse42.patch
@@ -0,0 +1,25 @@
+#Remove hard coded -xSSE4.2 compilation flag for Intel compilers (add the usual -xHOST)
+#compilation would fail on non-SSE4.2 CPUs, and for further CPUs/compilers it would restrict the generated code to SSE4.2
+# February 19th, 2016 by B. Hajgato - Free University Brussels (VUB)
+--- ./numpy/distutils/intelccompiler.py.orig	2016-01-06 22:07:54.000000000 +0100
++++ ./numpy/distutils/intelccompiler.py	2016-02-19 15:07:00.438235792 +0100
+@@ -54,7 +54,7 @@
+     def __init__(self, verbose=0, dry_run=0, force=0):
+         UnixCCompiler.__init__(self, verbose, dry_run, force)
+         self.cc_exe = ('icc -m64 -fPIC -fp-model strict -O3 '
+-                       '-fomit-frame-pointer -openmp -xSSE4.2')
++                       '-fomit-frame-pointer -openmp -xHOST')
+         compiler = self.cc_exe
+         if platform.system() == 'Darwin':
+             shared_flag = '-Wl,-undefined,dynamic_lookup'
+--- ./numpy/distutils/fcompiler/intel.py.orig	2016-01-07 03:16:25.000000000 +0100
++++ ./numpy/distutils/fcompiler/intel.py	2016-02-19 15:07:16.424220745 +0100
+@@ -123,7 +123,7 @@
+         return ['-openmp -fp-model strict']
+ 
+     def get_flags_arch(self):
+-        return ['-xSSE4.2']
++        return ['-xHOST']
+ 
+ # Is there no difference in the version string between the above compilers
+ # and the Visual compilers?
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 8678c701924df5aab730783955d159ac1e2ffbec..f8e2358b4aa780f53637547de88b7d42f3e50a97 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
@@ -23,10 +23,10 @@ source_urls = [('http://sourceforge.net/projects/pbwa/files/latest', 'download')
 
 dependencies = [('BWA', '0.7.4')]
 
-files_to_copy = [(['pBWA','qualfa2fq.pl','solid2fastq.pl' ], 'bin')]
+files_to_copy = [(['pBWA', 'qualfa2fq.pl', 'solid2fastq.pl'], 'bin')]
 
 sanity_check_paths = {
-    'files': ['bin/pBWA','bin/qualfa2fq.pl','bin/solid2fastq.pl'],
+    'files': ['bin/pBWA', 'bin/qualfa2fq.pl', 'bin/solid2fastq.pl'],
     'dirs': ['.'],
 }
 
diff --git a/easybuild/easyconfigs/p/packmol/packmol-13.243-ictce-4.1.13.eb b/easybuild/easyconfigs/p/packmol/packmol-13.243-ictce-4.1.13.eb
index a6e1069f314ae5a6cbc34fc721b817c5736d0a35..29c565eb8dc8f69ec04b33f9df4e1767c7c26d13 100644
--- a/easybuild/easyconfigs/p/packmol/packmol-13.243-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/p/packmol/packmol-13.243-ictce-4.1.13.eb
@@ -13,9 +13,9 @@ source_urls = ['https://packmol.googlecode.com/files']
 
 buildopts = 'FORTRAN="$F90"'
 
-files_to_copy = [(['packmol'],'bin'), 'COPYING', 'AUTHORS', 'LICENSE']
+files_to_copy = [(['packmol'], 'bin'), 'COPYING', 'AUTHORS', 'LICENSE']
 
-sanity_check_paths={
+sanity_check_paths = {
     'files': ['bin/packmol', 'COPYING', 'AUTHORS', 'LICENSE'],
     'dirs': [],
 }
diff --git a/easybuild/easyconfigs/p/petsc4py/petsc4py-3.3-goalf-1.1.0-no-OFED-Python-2.7.3.eb b/easybuild/easyconfigs/p/petsc4py/petsc4py-3.3-goalf-1.1.0-no-OFED-Python-2.7.3.eb
index 8d1c2ba947db9d23e2f03526d5e53d16a9402126..3f1cdad255d20ffcce59d21bb6dc66ac2b0f7fbd 100644
--- a/easybuild/easyconfigs/p/petsc4py/petsc4py-3.3-goalf-1.1.0-no-OFED-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/p/petsc4py/petsc4py-3.3-goalf-1.1.0-no-OFED-Python-2.7.3.eb
@@ -16,16 +16,16 @@ python_version = "2.7.3"
 versionsuffix = '-%s-%s' % (python, python_version)
 
 dependencies = [
-                (python, python_version),
-                ('PETSc', '3.3-p2', versionsuffix)
-               ]
+    (python, python_version),
+    ('PETSc', '3.3-p2', versionsuffix)
+]
 
 py_short_ver = ".".join(python_version.split(".")[0:2])
 pylibdir = "lib/python%s/site-packages/%s" % (py_short_ver, name)
 
 sanity_check_paths = {
-                      'files': [],
-                      'dirs': [pylibdir]
-                     }
+    'files': [],
+    'dirs': [pylibdir]
+}
 
 moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/p/petsc4py/petsc4py-3.3-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/p/petsc4py/petsc4py-3.3-goolf-1.4.10-Python-2.7.3.eb
index bdc63798eccfc0c97c0080a900ee6df1e4f06def..0387cd385f720012a4a2e64e4085bf23ebb7ac0d 100644
--- a/easybuild/easyconfigs/p/petsc4py/petsc4py-3.3-goolf-1.4.10-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/p/petsc4py/petsc4py-3.3-goolf-1.4.10-Python-2.7.3.eb
@@ -16,16 +16,16 @@ python_version = "2.7.3"
 versionsuffix = '-%s-%s' % (python, python_version)
 
 dependencies = [
-                (python, python_version),
-                ('PETSc', '3.3-p2', versionsuffix)
-               ]
+    (python, python_version),
+    ('PETSc', '3.3-p2', versionsuffix)
+]
 
 py_short_ver = ".".join(python_version.split(".")[0:2])
 pylibdir = "lib/python%s/site-packages/%s" % (py_short_ver, name)
 
 sanity_check_paths = {
-                      'files': [],
-                      'dirs': [pylibdir]
-                     }
+    'files': [],
+    'dirs': [pylibdir]
+}
 
 moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/p/petsc4py/petsc4py-3.3-ictce-4.0.6-Python-2.7.3.eb b/easybuild/easyconfigs/p/petsc4py/petsc4py-3.3-ictce-4.0.6-Python-2.7.3.eb
index 663ceba6becb343b46526898a66923ac5de0256c..72bb7cec0655b3831f32fb6cc37d20783f90c883 100644
--- a/easybuild/easyconfigs/p/petsc4py/petsc4py-3.3-ictce-4.0.6-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/p/petsc4py/petsc4py-3.3-ictce-4.0.6-Python-2.7.3.eb
@@ -16,16 +16,16 @@ python_version = "2.7.3"
 versionsuffix = '-%s-%s' % (python, python_version)
 
 dependencies = [
-                (python, python_version),
-                ('PETSc', '3.3-p2', versionsuffix)
-               ]
+    (python, python_version),
+    ('PETSc', '3.3-p2', versionsuffix)
+]
 
 py_short_ver = ".".join(python_version.split(".")[0:2])
 pylibdir = "lib/python%s/site-packages/%s" % (py_short_ver, name)
 
 sanity_check_paths = {
-                      'files': [],
-                      'dirs': [pylibdir]
-                     }
+    'files': [],
+    'dirs': [pylibdir]
+}
 
 moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/p/petsc4py/petsc4py-3.3-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/p/petsc4py/petsc4py-3.3-ictce-5.3.0-Python-2.7.3.eb
index 6af9bfee59a6e6cd365f12f3f72b3178e42d7c41..50d6cb2145c31cc0367c6cd648728b4b2721c53e 100644
--- a/easybuild/easyconfigs/p/petsc4py/petsc4py-3.3-ictce-5.3.0-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/p/petsc4py/petsc4py-3.3-ictce-5.3.0-Python-2.7.3.eb
@@ -17,16 +17,16 @@ python_version = "2.7.3"
 versionsuffix = '-%s-%s' % (python, python_version)
 
 dependencies = [
-                (python, python_version),
-                ('PETSc', '3.3-p2', versionsuffix)
-               ]
+    (python, python_version),
+    ('PETSc', '3.3-p2', versionsuffix)
+]
 
 py_short_ver = ".".join(python_version.split(".")[0:2])
 pylibdir = "lib/python%s/site-packages/%s" % (py_short_ver, name)
 
 sanity_check_paths = {
-                      'files': [],
-                      'dirs': [pylibdir]
-                     }
+    'files': [],
+    'dirs': [pylibdir]
+}
 
 moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/p/phonopy/phonopy-1.6.4-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/p/phonopy/phonopy-1.6.4-goolf-1.4.10-Python-2.7.3.eb
index 2e67c2d36793242665819bae697fbbeaa9042767..72709131d2fea61dacb221669132875e6b0f9be5 100644
--- a/easybuild/easyconfigs/p/phonopy/phonopy-1.6.4-goolf-1.4.10-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/p/phonopy/phonopy-1.6.4-goolf-1.4.10-Python-2.7.3.eb
@@ -32,4 +32,3 @@ sanity_check_paths = {
 }
 
 moduleclass = 'lib'
-
diff --git a/easybuild/easyconfigs/p/phonopy/phonopy-1.6.4-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/p/phonopy/phonopy-1.6.4-ictce-5.3.0-Python-2.7.3.eb
index c9d54a15dd18108e2af462283dc99c35f3b2391a..4f215834cc545cb92d0ba43155da1c5585f23a62 100644
--- a/easybuild/easyconfigs/p/phonopy/phonopy-1.6.4-ictce-5.3.0-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/p/phonopy/phonopy-1.6.4-ictce-5.3.0-Python-2.7.3.eb
@@ -32,4 +32,3 @@ sanity_check_paths = {
 }
 
 moduleclass = 'lib'
-
diff --git a/easybuild/easyconfigs/p/picard/picard-2.1.0.eb b/easybuild/easyconfigs/p/picard/picard-2.1.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..d68d511ad034bf378b5745c9d15aebec8218355b
--- /dev/null
+++ b/easybuild/easyconfigs/p/picard/picard-2.1.0.eb
@@ -0,0 +1,20 @@
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+# Author: Adam Huffman
+# The Francis Crick Institute
+
+name = 'picard'
+version = '2.1.0'
+
+homepage = 'http://broadinstitute.github.io/picard/'
+description = """ A set of command line tools (in Java) for manipulating
+ high-throughput sequencing (HTS) data and formats such as SAM/BAM/CRAM 
+ and VCF."""
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+source_urls = ['https://github.com/broadinstitute/%(name)s/releases/download/%(version)s']
+sources = ['%(name)s-tools-%(version)s.zip']
+
+dependencies = [('Java', '1.8.0_74')]
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/p/pip/pip-8.0.2-intel-2016a-Python-2.7.11.eb b/easybuild/easyconfigs/p/pip/pip-8.0.2-intel-2016a-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..7bc4eae5a192d2a7cd3239583dc6c4f04bf15363
--- /dev/null
+++ b/easybuild/easyconfigs/p/pip/pip-8.0.2-intel-2016a-Python-2.7.11.eb
@@ -0,0 +1,19 @@
+easyblock = 'PythonPackage'
+
+name = 'pip'
+version = '8.0.2'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'https://pip.pypa.io'
+description = """The PyPA recommended tool for installing Python packages."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [
+    ('Python', '2.7.11'),
+]
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/p/pixman/pixman-0.34.0-intel-2016a.eb b/easybuild/easyconfigs/p/pixman/pixman-0.34.0-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..79670989c4406cc3aef6a379d40aabca9f9b70e9
--- /dev/null
+++ b/easybuild/easyconfigs/p/pixman/pixman-0.34.0-intel-2016a.eb
@@ -0,0 +1,20 @@
+easyblock = 'ConfigureMake'
+
+name = "pixman"
+version = '0.34.0'
+
+homepage = 'http://www.pixman.org/'
+description = """Pixman is a low-level software library for pixel manipulation, providing features such as image
+compositing and trapezoid rasterization. Important users of pixman are the cairo graphics library and the X server."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+source_urls = ['http://cairographics.org/releases/']
+sources = [SOURCE_TAR_GZ]
+
+sanity_check_paths = {
+    'files': ['lib/libpixman-1.%s' % SHLIB_EXT],
+    'dirs': []
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/p/pkg-config/pkg-config-0.27.1-foss-2015b.eb b/easybuild/easyconfigs/p/pkg-config/pkg-config-0.27.1-foss-2015b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..73c06e7f1b0ec40c631a6591bb99bf9ea97db0b9
--- /dev/null
+++ b/easybuild/easyconfigs/p/pkg-config/pkg-config-0.27.1-foss-2015b.eb
@@ -0,0 +1,27 @@
+easyblock = 'ConfigureMake'
+
+name = 'pkg-config'
+version = '0.27.1'
+
+homepage = 'http://www.freedesktop.org/wiki/Software/pkg-config/'
+description = """pkg-config is a helper tool used when compiling applications and libraries. It helps you insert the
+ correct compiler options on the command line so an application can use
+  gcc -o test test.c `pkg-config --libs --cflags glib-2.0`
+ for instance, rather than hard-coding values on where to find glib (or other libraries)."""
+
+# don't use PAX, it might break.
+tar_config_opts = True
+
+toolchain = {'name': 'foss', 'version': '2015b'}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://pkgconfig.freedesktop.org/releases/']
+
+configopts = " --with-internal-glib"
+
+sanity_check_paths = {
+    'files': ['bin/pkg-config'],
+    'dirs': [],
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/p/pkg-config/pkg-config-0.27.1-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/p/pkg-config/pkg-config-0.27.1-goalf-1.1.0-no-OFED.eb
index ec3f8c364ac37c37755090ec53c7e937ead0e92d..5d80b51c52d405b97a3d4c71aa61efccf5ecd1f1 100644
--- a/easybuild/easyconfigs/p/pkg-config/pkg-config-0.27.1-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/p/pkg-config/pkg-config-0.27.1-goalf-1.1.0-no-OFED.eb
@@ -9,7 +9,7 @@ description = """pkg-config is a helper tool used when compiling applications an
   gcc -o test test.c `pkg-config --libs --cflags glib-2.0`
  for instance, rather than hard-coding values on where to find glib (or other libraries)."""
 
-toolchain = {'name': 'goalf', 'version' : '1.1.0-no-OFED'}
+toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
 
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = ['http://pkgconfig.freedesktop.org/releases/']
diff --git a/easybuild/easyconfigs/p/pkg-config/pkg-config-0.27.1-ictce-4.0.6.eb b/easybuild/easyconfigs/p/pkg-config/pkg-config-0.27.1-ictce-4.0.6.eb
index ca1b0b102a47143e5cc3cca693051a7e24dfa45f..059a00070094c105d09bba34ea1d3b9952fd4c9a 100644
--- a/easybuild/easyconfigs/p/pkg-config/pkg-config-0.27.1-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/p/pkg-config/pkg-config-0.27.1-ictce-4.0.6.eb
@@ -9,7 +9,7 @@ description = """pkg-config is a helper tool used when compiling applications an
   gcc -o test test.c `pkg-config --libs --cflags glib-2.0`
  for instance, rather than hard-coding values on where to find glib (or other libraries)."""
 
-toolchain = {'name': 'ictce', 'version' : '4.0.6'}
+toolchain = {'name': 'ictce', 'version': '4.0.6'}
 
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = ['http://pkgconfig.freedesktop.org/releases/']
diff --git a/easybuild/easyconfigs/p/pkg-config/pkg-config-0.27.1-intel-2015b.eb b/easybuild/easyconfigs/p/pkg-config/pkg-config-0.27.1-intel-2015b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..f271d1a6738954507f5984ca406b763ef39e8e28
--- /dev/null
+++ b/easybuild/easyconfigs/p/pkg-config/pkg-config-0.27.1-intel-2015b.eb
@@ -0,0 +1,27 @@
+easyblock = 'ConfigureMake'
+
+name = 'pkg-config'
+version = '0.27.1'
+
+homepage = 'http://www.freedesktop.org/wiki/Software/pkg-config/'
+description = """pkg-config is a helper tool used when compiling applications and libraries. It helps you insert the
+ correct compiler options on the command line so an application can use
+  gcc -o test test.c `pkg-config --libs --cflags glib-2.0`
+ for instance, rather than hard-coding values on where to find glib (or other libraries)."""
+
+# don't use PAX, it might break.
+tar_config_opts = True
+
+toolchain = {'name': 'intel', 'version': '2015b'}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://pkgconfig.freedesktop.org/releases/']
+
+configopts = " --with-internal-glib"
+
+sanity_check_paths = {
+    'files': ['bin/pkg-config'],
+    'dirs': [],
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/p/pkg-config/pkg-config-0.29-intel-2015a.eb b/easybuild/easyconfigs/p/pkg-config/pkg-config-0.29-intel-2015a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..55e66932e222da03ab889a915fb6dae72b893bc0
--- /dev/null
+++ b/easybuild/easyconfigs/p/pkg-config/pkg-config-0.29-intel-2015a.eb
@@ -0,0 +1,27 @@
+easyblock = 'ConfigureMake'
+
+name = 'pkg-config'
+version = '0.29'
+
+homepage = 'http://www.freedesktop.org/wiki/Software/pkg-config/'
+description = """pkg-config is a helper tool used when compiling applications and libraries. It helps you insert the
+ correct compiler options on the command line so an application can use
+  gcc -o test test.c `pkg-config --libs --cflags glib-2.0`
+ for instance, rather than hard-coding values on where to find glib (or other libraries)."""
+
+toolchain = {'name': 'intel', 'version': '2015a'}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://pkgconfig.freedesktop.org/releases/']
+
+# don't use PAX, it might break.
+tar_config_opts = True
+
+configopts = " --with-internal-glib"
+
+sanity_check_paths = {
+    'files': ['bin/pkg-config'],
+    'dirs': [],
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/p/pkg-config/pkg-config-0.29-intel-2015b.eb b/easybuild/easyconfigs/p/pkg-config/pkg-config-0.29-intel-2015b.eb
index 7a14bc5799fec03f796fa2af75292e96203ea6ea..245547ce08d9be50b45632bf690a26db4ad10fae 100644
--- a/easybuild/easyconfigs/p/pkg-config/pkg-config-0.29-intel-2015b.eb
+++ b/easybuild/easyconfigs/p/pkg-config/pkg-config-0.29-intel-2015b.eb
@@ -9,14 +9,14 @@ description = """pkg-config is a helper tool used when compiling applications an
   gcc -o test test.c `pkg-config --libs --cflags glib-2.0`
  for instance, rather than hard-coding values on where to find glib (or other libraries)."""
 
-# don't use PAX, it might break.
-tar_config_opts = True
-
 toolchain = {'name': 'intel', 'version': '2015b'}
 
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = ['http://pkgconfig.freedesktop.org/releases/']
 
+# don't use PAX, it might break.
+tar_config_opts = True
+
 configopts = " --with-internal-glib"
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/p/pkg-config/pkg-config-0.29-intel-2016a.eb b/easybuild/easyconfigs/p/pkg-config/pkg-config-0.29-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..cc9d6a1ec7323073bd61b4e523b8a2c814ecb151
--- /dev/null
+++ b/easybuild/easyconfigs/p/pkg-config/pkg-config-0.29-intel-2016a.eb
@@ -0,0 +1,27 @@
+easyblock = 'ConfigureMake'
+
+name = 'pkg-config'
+version = '0.29'
+
+homepage = 'http://www.freedesktop.org/wiki/Software/pkg-config/'
+description = """pkg-config is a helper tool used when compiling applications and libraries. It helps you insert the
+ correct compiler options on the command line so an application can use
+  gcc -o test test.c `pkg-config --libs --cflags glib-2.0`
+ for instance, rather than hard-coding values on where to find glib (or other libraries)."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://pkgconfig.freedesktop.org/releases/']
+
+# don't use PAX, it might break.
+tar_config_opts = True
+
+configopts = " --with-internal-glib"
+
+sanity_check_paths = {
+    'files': ['bin/pkg-config'],
+    'dirs': [],
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/p/pkgconfig/pkgconfig-1.1.0-intel-2015a-Python-2.7.9.eb b/easybuild/easyconfigs/p/pkgconfig/pkgconfig-1.1.0-intel-2015a-Python-2.7.9.eb
new file mode 100644
index 0000000000000000000000000000000000000000..e534f029a109cf707dfccd8c07d26c5db9f0b49e
--- /dev/null
+++ b/easybuild/easyconfigs/p/pkgconfig/pkgconfig-1.1.0-intel-2015a-Python-2.7.9.eb
@@ -0,0 +1,26 @@
+easyblock = 'PythonPackage'
+
+name = 'pkgconfig'
+version = '1.1.0'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'http://github.com/matze/pkgconfig'
+description = """pkgconfig is a Python module to interface with the pkg-config command line tool"""
+
+toolchain = {'name': 'intel', 'version': '2015a'}
+toolchainopts = {'usempi': True}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [
+    ('Python', '2.7.9'),
+    ('pkg-config', '0.29'),
+]
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%(pyshortver)s/site-packages/'],
+}
+
+moduleclass = 'data'
diff --git a/easybuild/easyconfigs/p/pkgconfig/pkgconfig-1.1.0-intel-2015b-Python-2.7.10.eb b/easybuild/easyconfigs/p/pkgconfig/pkgconfig-1.1.0-intel-2015b-Python-2.7.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..5280c703197d218db6e08fe818a95844549840f1
--- /dev/null
+++ b/easybuild/easyconfigs/p/pkgconfig/pkgconfig-1.1.0-intel-2015b-Python-2.7.10.eb
@@ -0,0 +1,26 @@
+easyblock = 'PythonPackage'
+
+name = 'pkgconfig'
+version = '1.1.0'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'http://github.com/matze/pkgconfig'
+description = """pkgconfig is a Python module to interface with the pkg-config command line tool"""
+
+toolchain = {'name': 'intel', 'version': '2015b'}
+toolchainopts = {'usempi': True}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [
+    ('Python', '2.7.10'),
+    ('pkg-config', '0.29'),
+]
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%(pyshortver)s/site-packages/'],
+}
+
+moduleclass = 'data'
diff --git a/easybuild/easyconfigs/p/pkgconfig/pkgconfig-1.1.0-intel-2015b-Python-2.7.11.eb b/easybuild/easyconfigs/p/pkgconfig/pkgconfig-1.1.0-intel-2015b-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..591418bb3891cf32d4e6a52ed73da0a22accf396
--- /dev/null
+++ b/easybuild/easyconfigs/p/pkgconfig/pkgconfig-1.1.0-intel-2015b-Python-2.7.11.eb
@@ -0,0 +1,26 @@
+easyblock = 'PythonPackage'
+
+name = 'pkgconfig'
+version = '1.1.0'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'http://github.com/matze/pkgconfig'
+description = """pkgconfig is a Python module to interface with the pkg-config command line tool"""
+
+toolchain = {'name': 'intel', 'version': '2015b'}
+toolchainopts = {'usempi': True}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [
+    ('Python', '2.7.11'),
+    ('pkg-config', '0.29'),
+]
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%(pyshortver)s/site-packages/'],
+}
+
+moduleclass = 'data'
diff --git a/easybuild/easyconfigs/p/pkgconfig/pkgconfig-1.1.0-intel-2016a-Python-2.7.11.eb b/easybuild/easyconfigs/p/pkgconfig/pkgconfig-1.1.0-intel-2016a-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..6fb647d4b858fcfbe8db19f91d0ae52de262911a
--- /dev/null
+++ b/easybuild/easyconfigs/p/pkgconfig/pkgconfig-1.1.0-intel-2016a-Python-2.7.11.eb
@@ -0,0 +1,26 @@
+easyblock = 'PythonPackage'
+
+name = 'pkgconfig'
+version = '1.1.0'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'http://github.com/matze/pkgconfig'
+description = """pkgconfig is a Python module to interface with the pkg-config command line tool"""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+toolchainopts = {'usempi': True}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [
+    ('Python', '2.7.11'),
+    ('pkg-config', '0.29'),
+]
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%(pyshortver)s/site-packages/'],
+}
+
+moduleclass = 'data'
diff --git a/easybuild/easyconfigs/p/popt/popt-1.14-GCC-4.8.2.eb b/easybuild/easyconfigs/p/popt/popt-1.14-GCC-4.8.2.eb
index 46a0db16f709ad7c5545ba36e5e0410ac452b53f..24c87fbd089624b2f7b4c6cf227fa079d794afb2 100644
--- a/easybuild/easyconfigs/p/popt/popt-1.14-GCC-4.8.2.eb
+++ b/easybuild/easyconfigs/p/popt/popt-1.14-GCC-4.8.2.eb
@@ -13,8 +13,8 @@ sources = [SOURCE_TAR_GZ]
 
 sanity_check_paths = {
     'files': ['include/popt.h',
-             ('lib/libpopt.a',  'lib64/libpopt.a'),
-             ('lib/libpopt.%s' % SHLIB_EXT, 'lib64/libpopt.%s' % SHLIB_EXT)],
+              ('lib/libpopt.a',  'lib64/libpopt.a'),
+              ('lib/libpopt.%s' % SHLIB_EXT, 'lib64/libpopt.%s' % SHLIB_EXT)],
     '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 24a941cf28cf4e61439ca6a6e96a85f846ba7669..59c5ad2adf590864716c35d1aaafa8478f71a5df 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
@@ -13,8 +13,8 @@ sources = [SOURCE_TAR_GZ]
 
 sanity_check_paths = {
     'files': ['include/popt.h',
-             ('lib/libpopt.a',  'lib64/libpopt.a'),
-             ('lib/libpopt.%s' % SHLIB_EXT, 'lib64/libpopt.%s' % SHLIB_EXT)],
+              ('lib/libpopt.a',  'lib64/libpopt.a'),
+              ('lib/libpopt.%s' % SHLIB_EXT, 'lib64/libpopt.%s' % SHLIB_EXT)],
     'dirs': [],
 }
 
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 07519cbd9a9c93889a94493de007b5fe1e3bd95c..fe0e0481dc8b92ea29703adcaf56d83bafe71fdc 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
@@ -10,17 +10,16 @@ toolchain = {'name': 'GCC', 'version': '4.9.2'}
 source_urls = ['http://rpm5.org/files/popt/']
 sources = [SOURCE_TAR_GZ]
 
-#see if this fixes the assembly language fauilure
+# see if this fixes the assembly language fauilure
 
 toolchainopts = {'optarch': False}
 sanity_check_paths = {
     'files': ['include/popt.h',
-             ('lib/libpopt.a',  'lib64/libpopt.a'),
-             ('lib/libpopt.%s' % SHLIB_EXT, 'lib64/libpopt.%s' % SHLIB_EXT)],
+              ('lib/libpopt.a',  'lib64/libpopt.a'),
+              ('lib/libpopt.%s' % SHLIB_EXT, 'lib64/libpopt.%s' % SHLIB_EXT)],
     'dirs': [],
 }
 
 maxparallel = 1
 
 moduleclass = 'lib'
-
diff --git a/easybuild/easyconfigs/p/pplacer/pplacer-1.1.alpha16-ictce-5.5.0-OCaml-4.01.0.eb b/easybuild/easyconfigs/p/pplacer/pplacer-1.1.alpha16-ictce-5.5.0-OCaml-4.01.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..67fa1882a40aadc45799f6208c72b8ec0c7bb61f
--- /dev/null
+++ b/easybuild/easyconfigs/p/pplacer/pplacer-1.1.alpha16-ictce-5.5.0-OCaml-4.01.0.eb
@@ -0,0 +1,38 @@
+name = 'pplacer'
+version = '1.1.alpha16'
+
+homepage = 'http://matsen.fhcrc.org/pplacer/'
+description = """Pplacer places query sequences on a fixed reference phylogenetic tree to maximize phylogenetic
+ likelihood or posterior probability according to a reference alignment. Pplacer is designed to be fast, to give
+ useful information about uncertainty, and to offer advanced visualization and downstream analysis."""
+
+toolchain = {'name': 'ictce', 'version': '5.5.0'}
+
+source_urls = [
+    'https://github.com/matsen/pplacer/archive/',
+    'https://github.com/matsen/pplacer-opam-repository/archive/',
+]
+sources = [
+    'v%(version)s.tar.gz',
+    'ba5e766.tar.gz',  # pplacer-opam-repository (20151002)
+]
+
+patches = ['pplacer-%(version)s_fix-sqlite3-req-pkg.patch']
+
+ocaml = 'OCaml'
+ocamlver = '4.01.0'
+versionsuffix = '-%s-%s' % (ocaml, ocamlver)
+dependencies = [
+    (ocaml, ocamlver),
+    ('zlib', '1.2.7'),  # for CamlZIP OCaml package
+    ('GSL', '1.16'),  # for GSL-OCaml package
+    ('SQLite', '3.8.6'),  # for SQLite3-OCaml package
+]
+builddependencies = [
+    ('M4', '1.4.17'),
+]
+
+# parallel build tends to break
+parallel = 1
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/p/pplacer/pplacer-1.1.alpha16_fix-sqlite3-req-pkg.patch b/easybuild/easyconfigs/p/pplacer/pplacer-1.1.alpha16_fix-sqlite3-req-pkg.patch
new file mode 100644
index 0000000000000000000000000000000000000000..6bb8c7268d272f967cd5da715b677fe5e1eaabaf
--- /dev/null
+++ b/easybuild/easyconfigs/p/pplacer/pplacer-1.1.alpha16_fix-sqlite3-req-pkg.patch
@@ -0,0 +1,11 @@
+fix name of required sqlite3-ocaml package
+see also https://github.com/matsen/pplacer/commit/4ae1c6803486a6460a776b6807657a3bcc4005da
+--- opam-requirements.txt.orig	2015-10-06 16:38:42.246475661 +0200
++++ opam-requirements.txt	2015-10-06 16:38:50.586708932 +0200
+@@ -4,5 +4,5 @@
+ mcl.12-068oasis3
+ batteries.2.1.0
+ ocaml-gsl.0.6.3
+-sqlite3-ocaml.1.6.3
++sqlite3.1.6.3
+ camlzip.1.05
diff --git a/easybuild/easyconfigs/p/printproto/printproto-1.0.5-goolf-1.4.10.eb b/easybuild/easyconfigs/p/printproto/printproto-1.0.5-goolf-1.4.10.eb
index 8346a5cd7ae54f5cd2bc05e11e620ce52cad0316..dacbb816a73bd4b3f209dcc7734044df662dd439 100644
--- a/easybuild/easyconfigs/p/printproto/printproto-1.0.5-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/p/printproto/printproto-1.0.5-goolf-1.4.10.eb
@@ -6,7 +6,7 @@ version = '1.0.5'
 homepage = 'http://xorg.freedesktop.org/'
 description = """X.org PrintProto protocol headers."""
 
-source_urls  = ['http://xorg.freedesktop.org/archive/individual/proto/']
+source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
 sources = [SOURCELOWER_TAR_GZ]
 
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
diff --git a/easybuild/easyconfigs/p/pscom/pscom-5.0.44-1-GCC-4.9.2.eb b/easybuild/easyconfigs/p/pscom/pscom-5.0.44-1-GCC-4.9.2.eb
index 605259b37f3e57acc9f76de99eab9453aa89d348..b69d0d92ddccf8c0bbdf11f201c49c19bf7b3da9 100644
--- a/easybuild/easyconfigs/p/pscom/pscom-5.0.44-1-GCC-4.9.2.eb
+++ b/easybuild/easyconfigs/p/pscom/pscom-5.0.44-1-GCC-4.9.2.eb
@@ -13,9 +13,8 @@ dependencies = [('popt', '1.16')]
 
 
 sanity_check_paths = {
-      'files': ['include/pscom.h', ('lib/libpscom.%s' % SHLIB_EXT, 'lib64/libpscom.%s' % SHLIB_EXT)],
-      'dirs': [],
+    'files': ['include/pscom.h', ('lib/libpscom.%s' % SHLIB_EXT, 'lib64/libpscom.%s' % SHLIB_EXT)],
+    'dirs': [],
 }
 
 moduleclass = 'lib'
-
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 3b463debfce745c731f036ae4755152a8dc21fb0..7da1e4a7f7181be6c837d49db84c243690fe24fb 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
@@ -13,8 +13,7 @@ sources = ['%(version)s.zip']
 dependencies = [('popt', '1.14')]
 
 sanity_check_paths = {
-      'files': ['include/pscom.h', ('lib/libpscom.%s' % SHLIB_EXT, 'lib64/libpscom.%s' % SHLIB_EXT)],
-      'dirs': [],
+    'files': ['include/pscom.h', ('lib/libpscom.%s' % SHLIB_EXT, 'lib64/libpscom.%s' % SHLIB_EXT)],
+    'dirs': [],
 }
 moduleclass = 'tools'
-
diff --git a/easybuild/easyconfigs/p/psmpi/psmpi-5.1.0-1-GCC-4.9.2.eb b/easybuild/easyconfigs/p/psmpi/psmpi-5.1.0-1-GCC-4.9.2.eb
index d99677edc9af1fc1cc95f156b31ec5e9d31b8329..3e04c7775f5125de2a275b0ca6cfa32f8275ea86 100644
--- a/easybuild/easyconfigs/p/psmpi/psmpi-5.1.0-1-GCC-4.9.2.eb
+++ b/easybuild/easyconfigs/p/psmpi/psmpi-5.1.0-1-GCC-4.9.2.eb
@@ -23,10 +23,7 @@ preconfigopts = 'export FC="$F90"; export FCFLAGS="$F90FLAGS"; unset F90; unset
 # Build shared libraries
 configopts = '--with-confset=gcc --enable-shared --enable-static'
 
-dependencies = [('pscom' , '5.0.44-1')]
-
-
-
+dependencies = [('pscom', '5.0.44-1')]
 
 sanity_check_paths = {
     'files': ['bin/mpicc', 'bin/mpicxx', 'bin/mpic++', 'bin/mpif77', 'bin/mpif90',
@@ -42,6 +39,4 @@ sanity_check_paths = {
     'dirs': [],
 }
 
-
 moduleclass = 'mpi'
-
diff --git a/easybuild/easyconfigs/p/psmpi/psmpi-5.1.0-1-iccifort-2015.1.133.eb b/easybuild/easyconfigs/p/psmpi/psmpi-5.1.0-1-iccifort-2015.1.133.eb
index fc50026e3c62ea98defd58d990aee339c42076dd..4bb1ff6f7abd3013b7fc5e2d052d19d260129e2f 100644
--- a/easybuild/easyconfigs/p/psmpi/psmpi-5.1.0-1-iccifort-2015.1.133.eb
+++ b/easybuild/easyconfigs/p/psmpi/psmpi-5.1.0-1-iccifort-2015.1.133.eb
@@ -23,8 +23,7 @@ preconfigopts = 'export FC="$F90"; export FCFLAGS="$F90FLAGS"; unset F90; unset
 # Build shared libraries
 configopts = '--with-confset=intel --enable-shared --enable-static --enable-romio --enable-mpe'
 
-dependencies = [('pscom' , '5.0.44-1')]
-
+dependencies = [('pscom', '5.0.44-1')]
 
 sanity_check_paths = {
     'files': ['bin/mpicc', 'bin/mpicxx', 'bin/mpic++', 'bin/mpif77', 'bin/mpif90',
@@ -41,4 +40,3 @@ sanity_check_paths = {
 }
 
 moduleclass = 'mpi'
-
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 d7fb1e75ef2509316ff78e6ef426798f413264c5..f88f324c9e4f0b509f8109b7ad1ef4770d3424a3 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
@@ -47,4 +47,3 @@ sanity_check_paths = {
 }
 
 moduleclass = 'mpi'
-
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 9c3dd66c7737eff336303c41ada3255e237aefc8..21643d2e8189651c48c0373794548065ca2fb03a 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
@@ -46,4 +46,3 @@ sanity_check_paths = {
 }
 
 moduleclass = 'mpi'
-
diff --git a/easybuild/easyconfigs/p/pyTables/pyTables-2.4.0-ictce-4.1.13-Python-2.7.3.eb b/easybuild/easyconfigs/p/pyTables/pyTables-2.4.0-ictce-4.1.13-Python-2.7.3.eb
index c5aa1dcd66798f5be200ada97bde0201a21a01a6..ee64c3384a2ce77a9136d2e8b510efb054257a3a 100644
--- a/easybuild/easyconfigs/p/pyTables/pyTables-2.4.0-ictce-4.1.13-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/p/pyTables/pyTables-2.4.0-ictce-4.1.13-Python-2.7.3.eb
@@ -24,16 +24,16 @@ pythonshortver = '.'.join(pythonver.split('.')[0:2])
 versionsuffix = '-%s-%s' % (python, pythonver)
 
 dependencies = [
-                (python, pythonver),
-                ('numexpr', '2.0.1', versionsuffix),
-                ('HDF5', '1.8.10', '-gpfs'),
-                ('Cython', '0.16', versionsuffix),
-               ]
+    (python, pythonver),
+    ('numexpr', '2.0.1', versionsuffix),
+    ('HDF5', '1.8.10', '-gpfs'),
+    ('Cython', '0.16', versionsuffix),
+]
 
 sanity_check_paths = {
-                      'files': ['bin/%s' % x for x in ['nctoh5', 'ptdump', 'ptrepack']],
-                      'dirs': ['lib/python%s/site-packages/tables' % pythonshortver]
-                     }
+    'files': ['bin/%s' % x for x in ['nctoh5', 'ptdump', 'ptrepack']],
+    'dirs': ['lib/python%s/site-packages/tables' % pythonshortver]
+}
 
 options = {'modulename': 'tables'}
 
diff --git a/easybuild/easyconfigs/p/pyringe/pyringe-1.0.2-intel-2016a-Python-2.7.11.eb b/easybuild/easyconfigs/p/pyringe/pyringe-1.0.2-intel-2016a-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..a162402911d42003dc800dde3c2ea7ee01585c4a
--- /dev/null
+++ b/easybuild/easyconfigs/p/pyringe/pyringe-1.0.2-intel-2016a-Python-2.7.11.eb
@@ -0,0 +1,26 @@
+easyblock = 'PythonPackage'
+
+name = 'pyringe'
+version = '1.0.2'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'https://github.com/google/pyringe'
+description = """Debugger capable of attaching to and injecting code into python processes."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+toolchainopts = {'usempi': True}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [
+    ('Python', '2.7.11'),
+    ('GDB', '7.10.1', versionsuffix),
+]
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%(pyshortver)s/site-packages/'],
+}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/q/QLogicMPI/QLogicMPI-2.9-926.1005_rhel5_qlc.eb b/easybuild/easyconfigs/q/QLogicMPI/QLogicMPI-2.9-926.1005_rhel5_qlc.eb
index f21ebd8d6387818bc9eb02e369f9a8e2a84ea12b..657fc8204a524205a8ae06346b58a31fb8d60e3a 100644
--- a/easybuild/easyconfigs/q/QLogicMPI/QLogicMPI-2.9-926.1005_rhel5_qlc.eb
+++ b/easybuild/easyconfigs/q/QLogicMPI/QLogicMPI-2.9-926.1005_rhel5_qlc.eb
@@ -15,12 +15,12 @@ toolchain = {'name': 'dummy', 'version': 'dummy'}
 
 # download the rpm directly or get it from the .bin file and extract it with ./nameoffile.bin -x and type yes
 sources = [
-           'mpi-benchmark-%s.x86_64.rpm' % version,
-           'mpi-libs-%s.x86_64.rpm' % version,
-           'mpi-frontend-%s.i386.rpm' % version,
-           'qlogic-mpi-register-0.1.0-926.1005_rhel5_qlc.noarch.rpm',
-           'mpi-devel-%s.noarch.rpm'%version
-          ]
+    'mpi-benchmark-%(version)s.x86_64.rpm',
+    'mpi-libs-%(version)s.x86_64.rpm',
+    'mpi-frontend-%(version)s.i386.rpm',
+    'qlogic-mpi-register-0.1.0-926.1005_rhel5_qlc.noarch.rpm',
+    'mpi-devel-%(version)s.noarch.rpm',
+]
 
 makesymlinks = ['usr/lib', 'usr/lib64', 'usr/include', 'usr/bin']
 
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 5406e997c6187a026e46f24878fbdb5d9767df68..feb87dfbe1d3b557cf922a43af4676ff71ead2e6 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
@@ -14,7 +14,7 @@ sources = ['%(namelower)s-everywhere-opensource-src-%(version)s.tar.gz']
 
 dependencies = [('GLib', '2.34.3')]
 
-configopts="-confirm-license -opensource -silent"
+configopts = "-confirm-license -opensource -silent"
 
 sanity_check_paths = {
     'files': ['lib/libQtCore.%s' % SHLIB_EXT],
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 c5c6c8344b447215cee434043b5cba839e44bb2c..1d7ae2908bf2da8a3d0c867f3ab655e52e4f1582 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
@@ -14,7 +14,7 @@ sources = ['%(namelower)s-everywhere-opensource-src-%(version)s.tar.gz']
 
 dependencies = [('GLib', '2.34.3')]
 
-configopts="-confirm-license -opensource -silent"
+configopts = "-confirm-license -opensource -silent"
 
 sanity_check_paths = {
     'files': ['lib/libQtCore.%s' % SHLIB_EXT],
diff --git a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-ictce-5.3.0.eb b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-ictce-5.3.0.eb
index 37bdd94912bf8d2c0d7bb1c1b5d216c4897a8dd9..09c9e0166c9f9849e559efbf09e97eda36140ee9 100644
--- a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-ictce-5.3.0.eb
@@ -15,7 +15,7 @@ sources = [
     'wannier90-1.2.tar.gz',
     'want-2.3.0.tar.gz',
     'yambo-3.2.1-r.448.tar.gz',
-          ]
+]
 source_urls = [
     'http://www.qe-forge.org/gf/download/frsrelease/64/96/',  # espresso-4.2.tar.gz
     'http://www.qe-forge.org/gf/download/frsrelease/64/97/',  # wannier90-1.2.tar.gz
diff --git a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-ictce-5.5.0.eb b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-ictce-5.5.0.eb
index 6b0604d138b44bbb3e87b98ded07e5f9eb8e2457..e7e19c03430fc1ce2e08e993924ca41b61ef194a 100644
--- a/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-ictce-5.5.0.eb
+++ b/easybuild/easyconfigs/q/QuantumESPRESSO/QuantumESPRESSO-4.2-ictce-5.5.0.eb
@@ -15,7 +15,7 @@ sources = [
     'wannier90-1.2.tar.gz',
     'want-2.3.0.tar.gz',
     'yambo-3.2.1-r.448.tar.gz',
-          ]
+]
 source_urls = [
     'http://www.qe-forge.org/gf/download/frsrelease/64/96/',  # espresso-4.2.tar.gz
     'http://www.qe-forge.org/gf/download/frsrelease/64/97/',  # wannier90-1.2.tar.gz
diff --git a/easybuild/easyconfigs/r/R-bundle-Bioconductor/R-bundle-Bioconductor-3.1-goolf-1.7.20-R-3.2.0.eb b/easybuild/easyconfigs/r/R-bundle-Bioconductor/R-bundle-Bioconductor-3.1-goolf-1.7.20-R-3.2.0.eb
index b172ff01378a04a83d2706c32bb475ee750f3433..1fcada16944596fe599346df24d558f40d6da926 100644
--- a/easybuild/easyconfigs/r/R-bundle-Bioconductor/R-bundle-Bioconductor-3.1-goolf-1.7.20-R-3.2.0.eb
+++ b/easybuild/easyconfigs/r/R-bundle-Bioconductor/R-bundle-Bioconductor-3.1-goolf-1.7.20-R-3.2.0.eb
@@ -133,6 +133,12 @@ exts_list = [
     ('derfinder', '1.2.1', bioconductor_options),
     ('polyester', '1.4.0', bioconductor_options),
     ('Rsubread', '1.18.0', bioconductor_options),
+    ('pcaMethods', '1.58.0', bioconductor_options),
+    ('marray', '1.46.0', bioconductor_options),
+    ('CGHbase', '1.28.0', bioconductor_options),
+    ('sigaR', '1.12.0', bioconductor_options),
+    ('HCsnip', '1.8.0', bioconductor_options),
+    ('metagenomeSeq', '1.10.0', bioconductor_options),
 ]
 
 modextrapaths = {'R_LIBS': ''}
diff --git a/easybuild/easyconfigs/r/R-bundle-Bioconductor/R-bundle-Bioconductor-3.1-intel-2015a-R-3.2.1.eb b/easybuild/easyconfigs/r/R-bundle-Bioconductor/R-bundle-Bioconductor-3.1-intel-2015a-R-3.2.1.eb
index 8c43cb0960d428b83d3692bdacfa8715b35aa779..21cd4399f4322ca920a9ddc63da22231148a8338 100644
--- a/easybuild/easyconfigs/r/R-bundle-Bioconductor/R-bundle-Bioconductor-3.1-intel-2015a-R-3.2.1.eb
+++ b/easybuild/easyconfigs/r/R-bundle-Bioconductor/R-bundle-Bioconductor-3.1-intel-2015a-R-3.2.1.eb
@@ -133,6 +133,12 @@ exts_list = [
     ('derfinder', '1.2.1', bioconductor_options),
     ('polyester', '1.4.0', bioconductor_options),
     ('Rsubread', '1.18.0', bioconductor_options),
+    ('pcaMethods', '1.58.0', bioconductor_options),
+    ('marray', '1.46.0', bioconductor_options),
+    ('CGHbase', '1.28.0', bioconductor_options),
+    ('sigaR', '1.12.0', bioconductor_options),
+    ('HCsnip', '1.8.0', bioconductor_options),
+    ('metagenomeSeq', '1.10.0', bioconductor_options),
 ]
 
 modextrapaths = {'R_LIBS': ''}
diff --git a/easybuild/easyconfigs/r/R-bundle-Bioconductor/R-bundle-Bioconductor-3.1-intel-2015b-R-3.2.1.eb b/easybuild/easyconfigs/r/R-bundle-Bioconductor/R-bundle-Bioconductor-3.1-intel-2015b-R-3.2.1.eb
index 1a0beb9ba94164d5f5c6ec39bfa65679891c6f23..c3940a90345daba21394e728149d5c7f30966841 100644
--- a/easybuild/easyconfigs/r/R-bundle-Bioconductor/R-bundle-Bioconductor-3.1-intel-2015b-R-3.2.1.eb
+++ b/easybuild/easyconfigs/r/R-bundle-Bioconductor/R-bundle-Bioconductor-3.1-intel-2015b-R-3.2.1.eb
@@ -134,6 +134,11 @@ exts_list = [
     ('polyester', '1.4.0', bioconductor_options),
     ('Rsubread', '1.18.0', bioconductor_options),
     ('pcaMethods', '1.58.0', bioconductor_options),
+    ('marray', '1.46.0', bioconductor_options),
+    ('CGHbase', '1.28.0', bioconductor_options),
+    ('sigaR', '1.12.0', bioconductor_options),
+    ('HCsnip', '1.8.0', bioconductor_options),
+    ('metagenomeSeq', '1.10.0', bioconductor_options),
 ]
 
 modextrapaths = {'R_LIBS': ''}
diff --git a/easybuild/easyconfigs/r/R-bundle-pbd/R-bundle-pbd-20150605-intel-2015a-R-3.1.3.eb b/easybuild/easyconfigs/r/R-bundle-pbd/R-bundle-pbd-20150605-intel-2015a-R-3.1.3.eb
index dd2dee5fb47b0b515cc7cff2c35bd95bfdffbd0c..95d136f187dac836955244170ecb488f87a38238 100644
--- a/easybuild/easyconfigs/r/R-bundle-pbd/R-bundle-pbd-20150605-intel-2015a-R-3.1.3.eb
+++ b/easybuild/easyconfigs/r/R-bundle-pbd/R-bundle-pbd-20150605-intel-2015a-R-3.1.3.eb
@@ -32,7 +32,8 @@ ext_options = {
 exts_list = [
     ('pbdMPI', '0.2-5', ext_options),
     ('pbdSLAP', '0.2-0', ext_options),
-    ('pbdBASE', '0.2-3', dict(ext_options.items() + [('patches', ['pbdBASE-02.3-0_ignore-BI_COMM_GLOBAL-for-intel-mpi.patch'])])),
+    ('pbdBASE', '0.2-3', dict(ext_options.items() +
+                              [('patches', ['pbdBASE-02.3-0_ignore-BI_COMM_GLOBAL-for-intel-mpi.patch'])])),
     ('pbdDMAT', '0.2-3', ext_options),
     ('pbdDEMO', '0.2-0', ext_options),
     ('pmclust', '0.1-6', ext_options),
diff --git a/easybuild/easyconfigs/r/R/R-3.1.2-foss-2015a.eb b/easybuild/easyconfigs/r/R/R-3.1.2-foss-2015a.eb
index bcd67f42d0f7f5ca9ee458da04019acf9368bb39..6eb8bee5ebfa035e40808d4dd1062f681d8c90c2 100644
--- a/easybuild/easyconfigs/r/R/R-3.1.2-foss-2015a.eb
+++ b/easybuild/easyconfigs/r/R/R-3.1.2-foss-2015a.eb
@@ -375,4 +375,3 @@ exts_list = [
 ]
 
 moduleclass = 'lang'
-
diff --git a/easybuild/easyconfigs/r/R/R-3.2.0-goolf-1.7.20.eb b/easybuild/easyconfigs/r/R/R-3.2.0-goolf-1.7.20.eb
index 37f178514d9137b6c8cd7cdbcd41fa96b53ad9cc..499d383ce4fc67899016e9947a2dba34495f0130 100644
--- a/easybuild/easyconfigs/r/R/R-3.2.0-goolf-1.7.20.eb
+++ b/easybuild/easyconfigs/r/R/R-3.2.0-goolf-1.7.20.eb
@@ -348,6 +348,11 @@ exts_list = [
     ('gdalUtils', '0.3.1', ext_options),
     ('pracma', '1.8.3', ext_options),
     ('bio3d', '2.2-2', ext_options),
+    ('penalized', '0.9-45', ext_options),
+    ('coin', '1.0-24', ext_options),
+    ('clusterRepro', '0.5-1.1', ext_options),
+    ('randomForestSRC', '2.0.7', ext_options),
+    ('sm', '2.2-5.4', ext_options),
 ]
 
 moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/r/R/R-3.2.1-foss-2015b.eb b/easybuild/easyconfigs/r/R/R-3.2.1-foss-2015b.eb
index 79832f4acc289a893b90cd99597d1a0a190a7c28..de7294123d8774da7eed64b8593342c67641671e 100644
--- a/easybuild/easyconfigs/r/R/R-3.2.1-foss-2015b.eb
+++ b/easybuild/easyconfigs/r/R/R-3.2.1-foss-2015b.eb
@@ -366,8 +366,6 @@ exts_list = [
     ('SuperLearner', '2.0-15', ext_options),
     ('lpSolve', '5.6.13', ext_options),
     ('mediation', '4.4.5', ext_options),
-    ('lpSolve', '5.6.13', ext_options),
-    ('mediation', '4.4.5', ext_options),
     ('caret', '6.0-57', ext_options),
     ('adabag', '4.1', ext_options),
     ('parallelMap', '1.3', ext_options),
@@ -383,6 +381,32 @@ exts_list = [
     ('EasyABC', '1.5', ext_options),
     ('shape', '1.4.2', ext_options),
     ('tidyr', '0.3.1', ext_options),
+    ('whisker', '0.3-2', ext_options),
+    ('rstudioapi', '0.4.0', ext_options),
+    ('roxygen2', '5.0.1', ext_options),
+    ('git2r', '0.13.1', ext_options),
+    ('xml2', '0.1.2', ext_options),
+    ('rversions', '1.0.2', ext_options),
+    ('devtools', '1.9.1', ext_options),
+    ('Rook', '1.1-1', ext_options),
+    ('rjson', '0.2.15', ext_options),
+    ('Cairo', '1.5-9', ext_options),
+    ('RMTstat', '0.3', ext_options),
+    ('Lmoments', '1.1-6', ext_options),
+    ('distillery', '1.0-2', ext_options),
+    ('extRemes', '2.0-7', ext_options),
+    ('pixmap', '0.4-11', ext_options),
+    ('tkrplot', '0.0-23', ext_options),
+    ('misc3d', '0.8-4', ext_options),
+    ('multicool', '0.1-9', ext_options),
+    ('ks', '1.10.1', ext_options),
+    ('logcondens', '2.1.4', ext_options),
+    ('Iso', '0.0-17', ext_options),
+    ('penalized', '0.9-45', ext_options),
+    ('coin', '1.0-24', ext_options),
+    ('clusterRepro', '0.5-1.1', ext_options),
+    ('randomForestSRC', '2.0.7', ext_options),
+    ('sm', '2.2-5.4', ext_options),
 ]
 
 moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/r/R/R-3.2.1-intel-2015a.eb b/easybuild/easyconfigs/r/R/R-3.2.1-intel-2015a.eb
index 06397a454b9ed5ab2a4628b2f4c31eeda2f3ee3f..644dcc259bb3bf662021a5295cbc0bfb3662ec71 100644
--- a/easybuild/easyconfigs/r/R/R-3.2.1-intel-2015a.eb
+++ b/easybuild/easyconfigs/r/R/R-3.2.1-intel-2015a.eb
@@ -366,8 +366,6 @@ exts_list = [
     ('SuperLearner', '2.0-15', ext_options),
     ('lpSolve', '5.6.13', ext_options),
     ('mediation', '4.4.5', ext_options),
-    ('lpSolve', '5.6.13', ext_options),
-    ('mediation', '4.4.5', ext_options),
     ('caret', '6.0-57', ext_options),
     ('adabag', '4.1', ext_options),
     ('parallelMap', '1.3', ext_options),
@@ -383,6 +381,32 @@ exts_list = [
     ('EasyABC', '1.5', ext_options),
     ('shape', '1.4.2', ext_options),
     ('tidyr', '0.3.1', ext_options),
+    ('whisker', '0.3-2', ext_options),
+    ('rstudioapi', '0.4.0', ext_options),
+    ('roxygen2', '5.0.1', ext_options),
+    ('git2r', '0.13.1', ext_options),
+    ('xml2', '0.1.2', ext_options),
+    ('rversions', '1.0.2', ext_options),
+    ('devtools', '1.9.1', ext_options),
+    ('Rook', '1.1-1', ext_options),
+    ('rjson', '0.2.15', ext_options),
+    ('Cairo', '1.5-9', ext_options),
+    ('RMTstat', '0.3', ext_options),
+    ('Lmoments', '1.1-6', ext_options),
+    ('distillery', '1.0-2', ext_options),
+    ('extRemes', '2.0-7', ext_options),
+    ('pixmap', '0.4-11', ext_options),
+    ('tkrplot', '0.0-23', ext_options),
+    ('misc3d', '0.8-4', ext_options),
+    ('multicool', '0.1-9', dict(ext_options.items() + [('patches', [('multicool-0.1-9_icpc-wd308.patch', 1)])])),
+    ('ks', '1.10.1', ext_options),
+    ('logcondens', '2.1.4', ext_options),
+    ('Iso', '0.0-17', ext_options),
+    ('penalized', '0.9-45', ext_options),
+    ('coin', '1.0-24', ext_options),
+    ('clusterRepro', '0.5-1.1', ext_options),
+    ('randomForestSRC', '2.0.7', ext_options),
+    ('sm', '2.2-5.4', ext_options),
 ]
 
 moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/r/R/R-3.2.1-intel-2015b.eb b/easybuild/easyconfigs/r/R/R-3.2.1-intel-2015b.eb
index 73337ba42844fbad9f956eebe8a90bfaf20056d0..36f8e25856a6d6f34807aa6562e83e9ae217aaa7 100644
--- a/easybuild/easyconfigs/r/R/R-3.2.1-intel-2015b.eb
+++ b/easybuild/easyconfigs/r/R/R-3.2.1-intel-2015b.eb
@@ -395,6 +395,18 @@ exts_list = [
     ('Lmoments', '1.1-6', ext_options),
     ('distillery', '1.0-2', ext_options),
     ('extRemes', '2.0-7', ext_options),
+    ('pixmap', '0.4-11', ext_options),
+    ('tkrplot', '0.0-23', ext_options),
+    ('misc3d', '0.8-4', ext_options),
+    ('multicool', '0.1-9', dict(ext_options.items() + [('patches', [('multicool-0.1-9_icpc-wd308.patch', 1)])])),
+    ('ks', '1.10.1', ext_options),
+    ('logcondens', '2.1.4', ext_options),
+    ('Iso', '0.0-17', ext_options),
+    ('penalized', '0.9-45', ext_options),
+    ('coin', '1.0-24', ext_options),
+    ('clusterRepro', '0.5-1.1', ext_options),
+    ('randomForestSRC', '2.0.7', ext_options),
+    ('sm', '2.2-5.4', ext_options),
 ]
 
 moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/r/R/R-3.2.3-foss-2015b.eb b/easybuild/easyconfigs/r/R/R-3.2.3-foss-2015b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..aae3ac82f68da3a823fb2f59fd8ae0c594a306f1
--- /dev/null
+++ b/easybuild/easyconfigs/r/R/R-3.2.3-foss-2015b.eb
@@ -0,0 +1,425 @@
+name = 'R'
+version = '3.2.3'
+
+homepage = 'http://www.r-project.org/'
+description = """R is a free software environment for statistical computing and graphics."""
+
+toolchain = {'name': 'foss', 'version': '2015b'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = ['http://cran.us.r-project.org/src/base/R-%(version_major)s']
+
+preconfigopts = 'BLAS_LIBS="$LIBBLAS" LAPACK_LIBS="$LIBLAPACK"'
+configopts = "--with-lapack --with-blas --with-pic --enable-threads --with-x=no --enable-R-shlib"
+# some recommended packages may fail in a parallel build (e.g. Matrix), and we're installing them anyway below
+configopts += " --with-recommended-packages=no"
+
+dependencies = [
+    ('libreadline', '6.3'),
+    ('ncurses', '5.9'),
+    ('libpng', '1.6.17'),  # for plotting in R
+    ('libjpeg-turbo', '1.4.1'),  # for plottting in R
+    ('Java', '1.8.0_72', '', True),  # Java bindings are built if Java is found, might as well provide it
+    ('Tcl', '8.6.4'),  # for tcltk
+    ('Tk', '8.6.4', '-no-X11'),  # for tcltk
+    ('cURL', '7.45.0'),  # for RCurl
+    ('libxml2', '2.9.2'),  # for XML
+    ('GDAL', '2.0.1'),  # for rgdal
+    ('PROJ', '4.8.0'), # for rgdal
+]
+
+name_tmpl = '%(name)s_%(version)s.tar.gz'
+ext_options = {
+    'source_urls': [
+        'http://cran.r-project.org/src/contrib/Archive/%(name)s',  # package archive
+        'http://cran.r-project.org/src/contrib/',  # current version of packages
+        'http://cran.freestatistics.org/src/contrib',  # mirror alternative for current packages
+    ],
+    'source_tmpl': name_tmpl,
+}
+
+
+# !! order of packages is important !!
+# packages updated on January 21st 2016
+exts_list = [
+    # default libraries, only here to sanity check their presence
+    'base',
+    'datasets',
+    'graphics',
+    'grDevices',
+    'grid',
+    'methods',
+    'splines',
+    'stats',
+    'stats4',
+    'tools',
+    'utils',
+    # non-standard libraries, should be specified with fixed versions!
+    ('Rmpi', '0.6-5', ext_options),
+    ('Rmpi', '0.6-5', ext_options),
+    ('abind', '1.4-3', ext_options),
+    ('magic', '1.5-6', ext_options),
+    ('geometry', '0.3-6', ext_options),
+    ('bit', '1.1-12', ext_options),
+    ('filehash', '2.3', ext_options),
+    ('ff', '2.2-13', ext_options),
+    ('bnlearn', '3.9', ext_options),
+    ('bootstrap', '2015.2', ext_options),
+    ('combinat', '0.0-8', ext_options),
+    ('deal', '1.2-37', ext_options),
+    ('fdrtool', '1.2.15', ext_options),
+    ('formatR', '1.2.1', ext_options),
+    ('gtools', '3.5.0', ext_options),
+    ('gdata', '2.17.0', ext_options),
+    ('GSA', '1.03', ext_options),
+    ('highr', '0.5.1', ext_options),
+    ('infotheo', '1.2.0', ext_options),
+    ('lars', '1.2', ext_options),
+    ('lazy', '1.2-15', ext_options),
+    ('kernlab', '0.9-22', ext_options),
+    ('mime', '0.4', ext_options),
+    ('markdown', '0.7.7', ext_options),
+    ('mlbench', '2.1-1', ext_options),
+    ('NLP', '0.1-8', ext_options),
+    ('mclust', '5.1', ext_options),
+    ('RANN', '2.5', ext_options),
+    ('rmeta', '2.16', ext_options),
+    ('segmented', '0.5-1.4', ext_options),
+    ('som', '0.3-5', ext_options),
+    ('SuppDists', '1.1-9.1', ext_options),
+    ('stabledist', '0.7-0', ext_options),
+    ('survivalROC', '1.0.3', ext_options),
+    ('pspline', '1.0-17', ext_options),
+    ('timeDate', '3012.100', ext_options),
+    ('longmemo', '1.0-0', ext_options),
+    ('ADGofTest', '0.3', ext_options),
+    ('ade4', '1.7-3', ext_options),
+    ('AlgDesign', '1.1-7.3', ext_options),
+    ('base64enc', '0.1-3', ext_options),
+    ('BH', '1.60.0-1', ext_options),
+    ('brew', '1.0-6', ext_options),
+    ('Brobdingnag', '1.2-4', ext_options),
+    ('corpcor', '1.6.8', ext_options),
+    ('longitudinal', '1.1.12', ext_options),
+    ('checkmate', '1.6.3', ext_options),
+    ('cubature', '1.1-2', ext_options),
+    ('DEoptimR', '1.0-4', ext_options),
+    ('digest', '0.6.8', ext_options),
+    ('fastmatch', '1.0-4', ext_options),
+    ('ffbase', '0.12.1', ext_options),
+    ('iterators', '1.0.8', ext_options),
+    ('maps', '3.0.2', ext_options),
+    ('nnls', '1.4', ext_options),
+    ('sendmailR', '1.2-1', ext_options),
+    ('spam', '1.3-0', ext_options),
+    ('subplex', '1.1-6', ext_options),
+    ('stringi', '1.0-1', ext_options),
+    ('magrittr', '1.5', ext_options),
+    ('stringr', '1.0.0', ext_options),
+    ('evaluate', '0.8', ext_options),
+    ('logspline', '2.1.8', ext_options),
+    ('ncbit', '2013.03.29', ext_options),
+    ('permute', '0.8-4', ext_options),
+    ('plotrix', '3.6-1', ext_options),
+    ('randomForest', '4.6-12', ext_options),
+    ('scatterplot3d', '0.3-36', ext_options),
+    ('SparseM', '1.7', ext_options),
+    ('tripack', '1.3-7', ext_options),
+    ('irace', '1.07', ext_options),
+    ('rJava', '0.9-7', ext_options),
+    ('lattice', '0.20-33', ext_options),
+    ('RColorBrewer', '1.1-2', ext_options),
+    ('latticeExtra', '0.6-26', ext_options),
+    ('Matrix', '1.2-3', ext_options),
+    ('png', '0.1-7', ext_options),
+    ('Rcpp', '0.12.2', ext_options),
+    ('RcppArmadillo', '0.6.400.2.2', ext_options),
+    ('plyr', '1.8.3', ext_options),
+    ('pROC', '1.8', ext_options),
+    ('quadprog', '1.5-5', ext_options),
+    ('BB', '2014.10-1', ext_options),
+    ('BBmisc', '1.9', ext_options),
+    ('fail', '1.3', ext_options),
+    ('rlecuyer', '0.3-4', ext_options),
+    ('snow', '0.4-1', ext_options),
+    ('MASS', '7.3-45', ext_options),
+    ('tree', '1.0-36', ext_options),
+    ('pls', '2.5-0', ext_options),
+    ('class', '7.3-14', ext_options),
+    ('e1071', '1.6-7', ext_options),
+    ('nnet', '7.3-11', ext_options),
+    ('nlme', '3.1-122', ext_options),
+    ('minqa', '1.2.4', ext_options),
+    ('RcppEigen', '0.3.2.5.1', ext_options),
+    ('MatrixModels', '0.4-1', ext_options),
+    ('quantreg', '5.19', ext_options),
+    ('mgcv', '1.8-10', ext_options),
+    ('colorspace', '1.2-6', ext_options),
+    ('robustbase', '0.92-5', ext_options),
+    ('sp', '1.2-1', ext_options),
+    ('zoo', '1.7-12', ext_options),
+    ('lmtest', '0.9-34', ext_options),
+    ('vcd', '1.4-1', ext_options),
+    ('snowfall', '1.84-6.1', ext_options),
+    ('rpart', '4.1-10', ext_options),
+    ('survival', '2.38-3', ext_options),
+    ('mice', '2.25', ext_options),
+    ('urca', '1.2-8', ext_options),
+    ('fracdiff', '1.4-2', ext_options),
+    ('logistf', '1.21', ext_options), 
+    ('akima', '0.5-12', ext_options),
+    ('bitops', '1.0-6', ext_options),
+    ('boot', '1.3-17', ext_options),
+    ('mixtools', '1.0.3', ext_options),
+    ('cluster', '2.0.3', ext_options),
+    ('gclus', '1.3.1', ext_options),
+    ('coda', '0.18-1', ext_options),
+    ('codetools', '0.2-14', ext_options),
+    ('foreach', '1.4.3', ext_options),
+    ('doMC', '1.3.4', ext_options),
+    ('DBI', '0.3.1', ext_options),
+    ('foreign', '0.8-66', ext_options),
+    ('gam', '1.12', ext_options),
+    ('gamlss.data', '4.3-2', ext_options),
+    ('gamlss.dist', '4.3-5', ext_options),
+    ('hwriter', '1.3.2', ext_options),
+    ('KernSmooth', '2.23-15', ext_options),
+    ('xts', '0.9-7', ext_options),
+    ('TTR', '0.23-0', ext_options),
+    ('quantmod', '0.4-5', ext_options),
+    ('mnormt', '1.5-3', ext_options),
+    ('mvtnorm', '1.0-3', ext_options),
+    ('pcaPP', '1.9-60', ext_options),
+    ('numDeriv', '2014.2-1', ext_options),
+    ('lava', '1.4.1', ext_options),
+    ('prodlim', '1.5.7', ext_options),
+    ('pscl', '1.4.9', ext_options),
+    ('RSQLite', '1.0.0', ext_options),
+    ('BatchJobs', '1.6', ext_options),
+    ('sandwich', '2.3-4', ext_options),
+    ('sfsmisc', '1.0-28', ext_options),
+    ('spatial', '7.3-11', ext_options),
+    ('VGAM', '1.0-0', ext_options),
+    ('waveslim', '1.7.5', ext_options),
+    ('xtable', '1.8-0', ext_options),
+    ('profileModel', '0.5-9', ext_options),
+    ('brglm', '0.5-9', ext_options),
+    ('deSolve', '1.12', ext_options),
+    ('tseriesChaos', '0.1-13', ext_options),
+    ('tseries', '0.10-34', ext_options),
+    ('fastICA', '1.2-0', ext_options),
+    ('R.methodsS3', '1.7.0', ext_options),
+    ('R.oo', '1.19.0', ext_options),
+    ('cgdsr', '1.2.5', ext_options),
+    ('R.utils', '2.2.0', ext_options),
+    ('R.matlab', '3.3.0', ext_options),
+    ('gbm', '2.1.1', ext_options),
+    ('dichromat', '2.0-0', ext_options),
+    ('Formula', '1.2-1', ext_options),
+    ('acepack', '1.3-3.3', ext_options),
+    ('reshape2', '1.4.1', ext_options),
+    ('gtable', '0.1.2', ext_options),
+    ('munsell', '0.4.2', ext_options),
+    ('labeling', '0.3', ext_options),
+    ('scales', '0.3.0', ext_options),
+    ('proto', '0.3-10', ext_options),
+    ('ggplot2', '2.0.0', ext_options),
+    ('gridExtra', '2.0.0', ext_options),
+    ('Hmisc', '3.17-1', ext_options),
+    ('fastcluster', '1.1.16', ext_options),
+    ('chron', '2.3-47', ext_options),
+    ('data.table', '1.9.6', ext_options),
+    ('registry', '0.3', ext_options),
+    ('pkgmaker', '0.22', ext_options),
+    ('rngtools', '1.2.4', ext_options),
+    ('doParallel', '1.0.10', ext_options),
+    ('gridBase', '0.4-7', ext_options),
+    ('NMF', '0.20.6', ext_options),
+    ('irlba', '2.0.0', ext_options),
+    ('igraph', '1.0.1', ext_options),
+    ('GeneNet', '1.2.13', ext_options),
+    ('ape', '3.4', ext_options),
+    ('htmltools', '0.3', ext_options),
+    ('RJSONIO', '1.3-0', ext_options),
+    ('caTools', '1.17.1', ext_options),
+    ('gplots', '2.17.0', ext_options),
+    ('ROCR', '1.0-7', ext_options),
+    ('httpuv', '1.3.3', ext_options),
+    ('R6', '2.1.1', ext_options),
+    ('jsonlite', '0.9.19', ext_options),
+    ('rjson', '0.2.15', ext_options),
+    ('shiny', '0.12.2', ext_options),
+    ('seqinr', '3.1-3', ext_options),
+    ('LearnBayes', '2.15', ext_options),
+    ('deldir', '0.1-9', ext_options),
+    ('spdep', '0.5-92', ext_options),
+    ('assertthat', '0.1', ext_options),
+    ('lazyeval', '0.1.10', ext_options),
+    ('dplyr', '0.4.3', ext_options),
+    ('adegenet', '2.0.0', ext_options),
+    ('rncl', '0.6.0', ext_options),
+    ('XML', '3.98-1.3', ext_options),
+    ('memoise', '0.2.1', ext_options),
+    ('crayon', '1.3.1', ext_options),
+    ('praise', '1.0.0', ext_options),
+    ('testthat', '0.11.0', ext_options),
+    ('yaml', '2.1.13', ext_options),
+    ('knitr', '1.11', ext_options),
+    ('rmarkdown', '0.9.2', ext_options),
+    ('curl', '0.9.4', ext_options),
+    ('httr', '1.0.0', ext_options),
+    ('reshape', '0.8.5', ext_options),
+    ('bold', '0.3.0', ext_options),
+    ('taxize', '0.7.0', ext_options),
+    ('tidyr', '0.3.1', ext_options),
+    ('uuid', '0.1-2', ext_options),
+    ('RNeXML', '2.0.5', ext_options),
+    ('phylobase', '0.8.0', ext_options),
+    ('adephylo', '1.1-6', ext_options),
+    ('animation', '2.4', ext_options),
+    ('bigmemory.sri', '0.1.3', ext_options),
+    ('bigmemory', '4.5.8', ext_options),
+    ('calibrate', '1.7.2', ext_options),
+    ('clusterGeneration', '1.3.4', ext_options),
+    ('raster', '2.5-2', ext_options),
+    ('dismo', '1.0-12', ext_options),
+    ('expm', '0.999-0', ext_options),
+    ('extrafontdb', '1.0', ext_options),
+    ('Rttf2pt1', '1.3.3', ext_options),
+    ('extrafont', '0.17', ext_options),
+    ('fields', '8.3-6', ext_options),
+    ('shapefiles', '0.7', ext_options),
+    ('fossil', '0.3.7', ext_options),
+    ('geiger', '2.0.6', ext_options),
+    ('glmnet', '2.0-2', ext_options),
+    ('rgl', '0.95.1441', ext_options),
+    ('labdsv', '1.7-0', ext_options),
+    ('stabs', '0.5-1', ext_options),
+    ('mboost', '2.5-0', ext_options),
+    ('msm', '1.6', ext_options),
+    ('nor1mix', '1.2-1', ext_options),
+    ('np', '0.60-2', ext_options),
+    ('polynom', '1.3-8', ext_options),
+    ('polspline', '1.1.12', ext_options),
+    ('TH.data', '1.0-6', ext_options),
+    ('multcomp', '1.4-1', ext_options),
+    ('rms', '4.4-1', ext_options),
+    ('RWekajars', '3.7.12-1', ext_options),
+    ('RWeka', '0.4-24', ext_options),
+    ('slam', '0.1-32', ext_options),
+    ('tm', '0.6-2', ext_options),
+    ('TraMineR', '1.8-11', ext_options),
+    ('chemometrics', '1.3.9', ext_options),
+    ('FNN', '1.1', ext_options),
+    ('ipred', '0.9-5', ext_options),
+    ('statmod', '1.4.23', ext_options),
+    ('miscTools', '0.6-16', ext_options),
+    ('maxLik', '1.3-4', ext_options),
+    ('mlogit', '0.2-4', ext_options),
+    ('getopt', '1.20.0', ext_options),
+    ('gsalib', '2.1', ext_options),
+    ('optparse', '1.3.2', ext_options),
+    ('klaR', '0.6-12', ext_options),
+    ('neuRosim', '0.2-12', ext_options),
+    ('locfit', '1.5-9.1', ext_options),
+    ('GGally', '1.0.0', ext_options),
+    ('beanplot', '1.2', ext_options),
+    ('clValid', '0.6-6', ext_options),
+    ('matrixStats', '0.50.1', ext_options),
+    ('DiscriMiner', '0.1-29', ext_options),
+    ('ellipse', '0.3-8', ext_options),
+    ('leaps', '2.9', ext_options),
+    ('nloptr', '1.0.4', ext_options),
+    ('lme4', '1.1-10', ext_options),
+    ('pbkrtest', '0.4-4', ext_options),
+    ('car', '2.1-1', ext_options),
+    ('flashClust', '1.01-2', ext_options),
+    ('FactoMineR', '1.31.4', ext_options),
+    ('modeltools', '0.2-21', ext_options),
+    ('flexclust', '1.3-4', ext_options),
+    ('flexmix', '2.3-13', ext_options),
+    ('prabclus', '2.2-6', ext_options),
+    ('diptest', '0.75-7', ext_options),
+    ('trimcluster', '0.1-2', ext_options),
+    ('fpc', '2.1-10', ext_options),
+    ('BiasedUrn', '1.07', ext_options),
+    ('TeachingDemos', '2.9', ext_options),
+    ('kohonen', '2.0.19', ext_options),
+    ('base64', '1.1', ext_options),
+    ('doRNG', '1.6', ext_options),
+    ('nleqslv', '2.9.1', ext_options),
+    ('RGCCA', '2.0', ext_options),
+    ('pheatmap', '1.0.8', ext_options),
+    ('openxlsx', '3.0.0', ext_options),
+    ('pvclust', '2.0-0', ext_options),
+    ('RCircos', '1.1.3', ext_options),
+    ('lambda.r', '1.1.7', ext_options),
+    ('futile.options', '1.0.0', ext_options),
+    ('futile.logger', '1.4.1', ext_options),
+    ('VennDiagram', '1.6.16', ext_options),
+    ('xlsxjars', '0.6.1', ext_options),
+    ('xlsx', '0.5.7', ext_options),
+    ('vegan', '2.3-2', ext_options),
+    ('forecast', '6.1', ext_options),
+    ('fma', '2.01', ext_options),
+    ('expsmooth', '2.3', ext_options),
+    ('fpp', '0.5', ext_options),
+    ('maptools', '0.8-37', ext_options),
+    ('deldir', '0.1-9', ext_options),
+    ('tensor', '1.5', ext_options),
+    ('polyclip', '1.3-2', ext_options),
+    ('goftest', '1.0-3', ext_options),
+    ('spatstat', '1.44-1', ext_options),
+    ('rgdal', '1.1-3', ext_options),
+    ('gdalUtils', '2.0.1.7', ext_options),
+    ('pracma', '1.8.8', ext_options),
+    ('RCurl', '1.95-4.7', ext_options),
+    ('bio3d', '2.2-4', ext_options),
+    ('AUC', '0.3.0', ext_options),
+    ('interpretR', '0.2.3', ext_options),
+    ('SuperLearner', '2.0-15', ext_options),
+    ('lpSolve', '5.6.13', ext_options),
+    ('mediation', '4.4.5', ext_options),
+    ('caret', '6.0-64', ext_options),
+    ('adabag', '4.1', ext_options),
+    ('parallelMap', '1.3', ext_options),
+    ('ParamHelpers', '1.6', ext_options),
+    ('ggvis', '0.4.2', ext_options),
+    ('mlr', '2.7', ext_options),
+    ('unbalanced', '2.0', ext_options),
+    ('RSNNS', '0.4-7', ext_options),
+    ('abc.data', '1.0', ext_options),
+    ('abc', '2.1', ext_options),
+    ('lhs', '0.10', ext_options),
+    ('tensorA', '0.36', ext_options),
+    ('EasyABC', '1.5', ext_options),
+    ('shape', '1.4.2', ext_options),
+    ('whisker', '0.3-2', ext_options),
+    ('rstudioapi', '0.4.0', ext_options),
+    ('roxygen2', '5.0.1', ext_options),
+    ('git2r', '0.13.1', ext_options),
+    ('xml2', '0.1.2', ext_options),
+    ('rversions', '1.0.2', ext_options),
+    ('devtools', '1.9.1', ext_options),
+    ('Rook', '1.1-1', ext_options),
+    ('rjson', '0.2.15', ext_options),
+    ('Cairo', '1.5-9', ext_options),
+    ('RMTstat', '0.3', ext_options),
+    ('Lmoments', '1.1-6', ext_options),
+    ('distillery', '1.0-2', ext_options),
+    ('extRemes', '2.0-7', ext_options),
+    ('pixmap', '0.4-11', ext_options),
+    ('tkrplot', '0.0-23', ext_options),
+    ('misc3d', '0.8-4', ext_options),
+    ('multicool', '0.1-9', ext_options),
+    ('ks', '1.10.1', ext_options),
+    ('logcondens', '2.1.4', ext_options),
+    ('Iso', '0.0-17', ext_options),
+    ('penalized', '0.9-45', ext_options),
+    ('coin', '1.1-2', ext_options),
+    ('clusterRepro', '0.5-1.1', ext_options),
+    ('randomForestSRC', '2.0.7', ext_options),
+    ('sm', '2.2-5.4', ext_options),
+]
+
+moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/r/R/multicool-0.1-9_icpc-wd308.patch b/easybuild/easyconfigs/r/R/multicool-0.1-9_icpc-wd308.patch
new file mode 100644
index 0000000000000000000000000000000000000000..35704c2945694c7c017dec2366f84ff09262e018
--- /dev/null
+++ b/easybuild/easyconfigs/r/R/multicool-0.1-9_icpc-wd308.patch
@@ -0,0 +1,16 @@
+add -wd308 compiler option to avoid compiler warning #308 being treated as an error
+author: Kenneth Hoste (HPC-UGent)
+diff -ruN multicool.orig/MD5 multicool/MD5
+--- multicool.orig/MD5	2015-10-28 18:39:18.000000000 +0100
++++ multicool/MD5	2016-02-23 14:09:09.547773000 +0100
+@@ -20,3 +20,4 @@
+ b18b7e9e5912cf1014aa2c2fa8e86047 *src/compositions.cpp
+ 79239d0d8b59b7533a639d668c3a0857 *src/multicool.cpp
+ 62c660482671757c5490a422d955cbe1 *src/multinomial.h
++b1d3a4d02405fe08c7983c479bc27f13 *src/Makevars
+diff -ruN multicool.orig/src/Makevars multicool/src/Makevars
+--- multicool.orig/src/Makevars	1970-01-01 01:00:00.000000000 +0100
++++ multicool/src/Makevars	2016-02-23 13:24:01.456230240 +0100
+@@ -0,0 +1,2 @@
++# disable Intel C++ compiler (icpc) warning/error #308, to avoid 'member "std::complex<double>::_M_value" is inaccessible'
++PKG_CXXFLAGS = -wd308
diff --git a/easybuild/easyconfigs/r/RAxML/RAxML-7.2.6-goolf-1.4.10-hybrid-sse3.eb b/easybuild/easyconfigs/r/RAxML/RAxML-7.2.6-goolf-1.4.10-hybrid-sse3.eb
index 567f46f555eec35381b5f2937f134dc1cd6c9576..985c8834410dee1a0007ae834275701ae6b5df5b 100644
--- a/easybuild/easyconfigs/r/RAxML/RAxML-7.2.6-goolf-1.4.10-hybrid-sse3.eb
+++ b/easybuild/easyconfigs/r/RAxML/RAxML-7.2.6-goolf-1.4.10-hybrid-sse3.eb
@@ -2,7 +2,7 @@ easyblock = 'ConfigureMake'
 
 name = 'RAxML'
 version = '7.2.6'
-versionsuffix ='-hybrid-sse3'
+versionsuffix = '-hybrid-sse3'
 
 homepage = 'https://github.com/stamatak/standard-RAxML'
 description = "RAxML search algorithm for maximum likelihood based inference of phylogenetic trees."
@@ -10,7 +10,7 @@ description = "RAxML search algorithm for maximum likelihood based inference of
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 toolchainopts = {'usempi': True}
 
-# download from http://sco.h-its.org/exelixis/countSource726.php
+source_urls = ['http://sco.h-its.org/exelixis/resource/download/software/']
 sources = [SOURCE_TAR_BZ2]
 
 skipsteps = ['configure', 'install']
diff --git a/easybuild/easyconfigs/r/RAxML/RAxML-7.2.6-goolf-1.4.10-mpi-sse3.eb b/easybuild/easyconfigs/r/RAxML/RAxML-7.2.6-goolf-1.4.10-mpi-sse3.eb
index 0a2fbab41aff8754363edef106b740ab097b3082..e09f71abf5311cc945fff303141937988b4aef46 100644
--- a/easybuild/easyconfigs/r/RAxML/RAxML-7.2.6-goolf-1.4.10-mpi-sse3.eb
+++ b/easybuild/easyconfigs/r/RAxML/RAxML-7.2.6-goolf-1.4.10-mpi-sse3.eb
@@ -2,7 +2,7 @@ easyblock = 'ConfigureMake'
 
 name = 'RAxML'
 version = '7.2.6'
-versionsuffix ='-mpi-sse3'
+versionsuffix = '-mpi-sse3'
 
 homepage = 'https://github.com/stamatak/standard-RAxML'
 description = "RAxML search algorithm for maximum likelihood based inference of phylogenetic trees."
@@ -10,7 +10,7 @@ description = "RAxML search algorithm for maximum likelihood based inference of
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 toolchainopts = {'usempi': True}
 
-# download from http://sco.h-its.org/exelixis/countSource726.php
+source_urls = ['http://sco.h-its.org/exelixis/resource/download/software/']
 sources = [SOURCE_TAR_BZ2]
 
 skipsteps = ['configure', 'install']
diff --git a/easybuild/easyconfigs/r/RAxML/RAxML-7.2.6-goolf-1.4.10-mt-sse3.eb b/easybuild/easyconfigs/r/RAxML/RAxML-7.2.6-goolf-1.4.10-mt-sse3.eb
index ebf504fd65afc6ccd9eaef07d2c93fac7016ce73..0fe0530f3ac458336b7b01ef6ded89cdce9fb398 100644
--- a/easybuild/easyconfigs/r/RAxML/RAxML-7.2.6-goolf-1.4.10-mt-sse3.eb
+++ b/easybuild/easyconfigs/r/RAxML/RAxML-7.2.6-goolf-1.4.10-mt-sse3.eb
@@ -2,14 +2,14 @@ easyblock = 'ConfigureMake'
 
 name = 'RAxML'
 version = '7.2.6'
-versionsuffix ='-mt-sse3'
+versionsuffix = '-mt-sse3'
 
 homepage = 'https://github.com/stamatak/standard-RAxML'
 description = "RAxML search algorithm for maximum likelihood based inference of phylogenetic trees."
 
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 
-# download from http://sco.h-its.org/exelixis/countSource726.php
+source_urls = ['http://sco.h-its.org/exelixis/resource/download/software/']
 sources = [SOURCE_TAR_BZ2]
 
 skipsteps = ['configure', 'install']
diff --git a/easybuild/easyconfigs/r/RAxML/RAxML-7.2.6-goolf-1.4.10-seq-sse3.eb b/easybuild/easyconfigs/r/RAxML/RAxML-7.2.6-goolf-1.4.10-seq-sse3.eb
index 67c58af8a4c7687eb59d0d754053af2745da8c8c..af08c5c5e5b419e36c2137e17d3987365ba25866 100644
--- a/easybuild/easyconfigs/r/RAxML/RAxML-7.2.6-goolf-1.4.10-seq-sse3.eb
+++ b/easybuild/easyconfigs/r/RAxML/RAxML-7.2.6-goolf-1.4.10-seq-sse3.eb
@@ -2,14 +2,14 @@ easyblock = 'ConfigureMake'
 
 name = 'RAxML'
 version = '7.2.6'
-versionsuffix ='-seq-sse3'
+versionsuffix = '-seq-sse3'
 
 homepage = 'https://github.com/stamatak/standard-RAxML'
 description = "RAxML search algorithm for maximum likelihood based inference of phylogenetic trees."
 
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 
-# download from http://sco.h-its.org/exelixis/countSource726.php
+source_urls = ['http://sco.h-its.org/exelixis/resource/download/software/']
 sources = [SOURCE_TAR_BZ2]
 
 skipsteps = ['configure', 'install']
diff --git a/easybuild/easyconfigs/r/RAxML/RAxML-7.2.6-ictce-4.1.13-hybrid-sse3.eb b/easybuild/easyconfigs/r/RAxML/RAxML-7.2.6-ictce-4.1.13-hybrid-sse3.eb
index 4d4122a29d2d6ecf1e0bf2ebe5562058f9227598..caa22646501f373b7f4e46152ea97ef846c8bdd8 100644
--- a/easybuild/easyconfigs/r/RAxML/RAxML-7.2.6-ictce-4.1.13-hybrid-sse3.eb
+++ b/easybuild/easyconfigs/r/RAxML/RAxML-7.2.6-ictce-4.1.13-hybrid-sse3.eb
@@ -2,7 +2,7 @@ easyblock = 'ConfigureMake'
 
 name = 'RAxML'
 version = '7.2.6'
-versionsuffix ='-hybrid-sse3'
+versionsuffix = '-hybrid-sse3'
 
 homepage = 'https://github.com/stamatak/standard-RAxML'
 description = "RAxML search algorithm for maximum likelihood based inference of phylogenetic trees."
@@ -10,7 +10,7 @@ description = "RAxML search algorithm for maximum likelihood based inference of
 toolchain = {'name': 'ictce', 'version': '4.1.13'}
 toolchainopts = {'usempi': True}
 
-# download from http://sco.h-its.org/exelixis/countSource726.php
+source_urls = ['http://sco.h-its.org/exelixis/resource/download/software/']
 sources = [SOURCE_TAR_BZ2]
 
 skipsteps = ['configure', 'install']
diff --git a/easybuild/easyconfigs/r/RAxML/RAxML-7.2.6-ictce-4.1.13-mpi-sse3.eb b/easybuild/easyconfigs/r/RAxML/RAxML-7.2.6-ictce-4.1.13-mpi-sse3.eb
index bb28e8240e3876b6ca1af521c576f3fee5ee4a6a..f75155255a80a76671164555158c3c9ea2613bc1 100644
--- a/easybuild/easyconfigs/r/RAxML/RAxML-7.2.6-ictce-4.1.13-mpi-sse3.eb
+++ b/easybuild/easyconfigs/r/RAxML/RAxML-7.2.6-ictce-4.1.13-mpi-sse3.eb
@@ -2,7 +2,7 @@ easyblock = 'ConfigureMake'
 
 name = 'RAxML'
 version = '7.2.6'
-versionsuffix ='-mpi-sse3'
+versionsuffix = '-mpi-sse3'
 
 homepage = 'https://github.com/stamatak/standard-RAxML'
 description = "RAxML search algorithm for maximum likelihood based inference of phylogenetic trees."
@@ -10,7 +10,7 @@ description = "RAxML search algorithm for maximum likelihood based inference of
 toolchain = {'name': 'ictce', 'version': '4.1.13'}
 toolchainopts = {'usempi': True}
 
-# download from http://sco.h-its.org/exelixis/countSource726.php
+source_urls = ['http://sco.h-its.org/exelixis/resource/download/software/']
 sources = [SOURCE_TAR_BZ2]
 
 skipsteps = ['configure', 'install']
diff --git a/easybuild/easyconfigs/r/RAxML/RAxML-7.2.6-ictce-4.1.13-mt-sse3.eb b/easybuild/easyconfigs/r/RAxML/RAxML-7.2.6-ictce-4.1.13-mt-sse3.eb
index 9768fc2a61bf0ab392c688512fc567b80ae47fb7..8d232532fb443d1bece73f1c14b80fa42511e868 100644
--- a/easybuild/easyconfigs/r/RAxML/RAxML-7.2.6-ictce-4.1.13-mt-sse3.eb
+++ b/easybuild/easyconfigs/r/RAxML/RAxML-7.2.6-ictce-4.1.13-mt-sse3.eb
@@ -2,14 +2,14 @@ easyblock = 'ConfigureMake'
 
 name = 'RAxML'
 version = '7.2.6'
-versionsuffix ='-mt-sse3'
+versionsuffix = '-mt-sse3'
 
 homepage = 'https://github.com/stamatak/standard-RAxML'
 description = "RAxML search algorithm for maximum likelihood based inference of phylogenetic trees."
 
 toolchain = {'name': 'ictce', 'version': '4.1.13'}
 
-# download from http://sco.h-its.org/exelixis/countSource726.php
+source_urls = ['http://sco.h-its.org/exelixis/resource/download/software/']
 sources = [SOURCE_TAR_BZ2]
 
 skipsteps = ['configure', 'install']
diff --git a/easybuild/easyconfigs/r/RAxML/RAxML-7.2.6-ictce-4.1.13-seq-sse3.eb b/easybuild/easyconfigs/r/RAxML/RAxML-7.2.6-ictce-4.1.13-seq-sse3.eb
index 6c06107ea39ab6d62175eff4fcc4a0cd652923f8..13378694a33e31ba721adbd6469e841d85eb19f1 100644
--- a/easybuild/easyconfigs/r/RAxML/RAxML-7.2.6-ictce-4.1.13-seq-sse3.eb
+++ b/easybuild/easyconfigs/r/RAxML/RAxML-7.2.6-ictce-4.1.13-seq-sse3.eb
@@ -2,14 +2,14 @@ easyblock = 'ConfigureMake'
 
 name = 'RAxML'
 version = '7.2.6'
-versionsuffix ='-seq-sse3'
+versionsuffix = '-seq-sse3'
 
 homepage = 'https://github.com/stamatak/standard-RAxML'
 description = "RAxML search algorithm for maximum likelihood based inference of phylogenetic trees."
 
 toolchain = {'name': 'ictce', 'version': '4.1.13'}
 
-# download from http://sco.h-its.org/exelixis/countSource726.php
+source_urls = ['http://sco.h-its.org/exelixis/resource/download/software/']
 sources = [SOURCE_TAR_BZ2]
 
 skipsteps = ['configure', 'install']
diff --git a/easybuild/easyconfigs/r/RAxML/RAxML-7.2.6-ictce-5.3.0-hybrid-sse3.eb b/easybuild/easyconfigs/r/RAxML/RAxML-7.2.6-ictce-5.3.0-hybrid-sse3.eb
index c8becaa3bbb0cf6a00923be4480f5f5973465ed7..0868a2b38e16acace4b0a5184109d6e666ae026b 100644
--- a/easybuild/easyconfigs/r/RAxML/RAxML-7.2.6-ictce-5.3.0-hybrid-sse3.eb
+++ b/easybuild/easyconfigs/r/RAxML/RAxML-7.2.6-ictce-5.3.0-hybrid-sse3.eb
@@ -2,7 +2,7 @@ easyblock = 'ConfigureMake'
 
 name = 'RAxML'
 version = '7.2.6'
-versionsuffix ='-hybrid-sse3'
+versionsuffix = '-hybrid-sse3'
 
 homepage = 'https://github.com/stamatak/standard-RAxML'
 description = "RAxML search algorithm for maximum likelihood based inference of phylogenetic trees."
@@ -10,7 +10,7 @@ description = "RAxML search algorithm for maximum likelihood based inference of
 toolchain = {'name': 'ictce', 'version': '5.3.0'}
 toolchainopts = {'usempi': True}
 
-# download from http://sco.h-its.org/exelixis/countSource726.php
+source_urls = ['http://sco.h-its.org/exelixis/resource/download/software']
 sources = [SOURCE_TAR_BZ2]
 
 skipsteps = ['configure', 'install']
diff --git a/easybuild/easyconfigs/r/RAxML/RAxML-7.2.6-ictce-5.3.0-mpi-sse3.eb b/easybuild/easyconfigs/r/RAxML/RAxML-7.2.6-ictce-5.3.0-mpi-sse3.eb
index e759597ee18693de988d367700810c6bd0064cf9..3a1597463cd48a11bf4bbb1a7d07c07182f4938b 100644
--- a/easybuild/easyconfigs/r/RAxML/RAxML-7.2.6-ictce-5.3.0-mpi-sse3.eb
+++ b/easybuild/easyconfigs/r/RAxML/RAxML-7.2.6-ictce-5.3.0-mpi-sse3.eb
@@ -2,7 +2,7 @@ easyblock = 'ConfigureMake'
 
 name = 'RAxML'
 version = '7.2.6'
-versionsuffix ='-mpi-sse3'
+versionsuffix = '-mpi-sse3'
 
 homepage = 'https://github.com/stamatak/standard-RAxML'
 description = "RAxML search algorithm for maximum likelihood based inference of phylogenetic trees."
@@ -10,7 +10,7 @@ description = "RAxML search algorithm for maximum likelihood based inference of
 toolchain = {'name': 'ictce', 'version': '5.3.0'}
 toolchainopts = {'usempi': True}
 
-# download from http://sco.h-its.org/exelixis/countSource726.php
+source_urls = ['http://sco.h-its.org/exelixis/resource/download/software/']
 sources = [SOURCE_TAR_BZ2]
 
 skipsteps = ['configure', 'install']
diff --git a/easybuild/easyconfigs/r/RAxML/RAxML-7.2.6-ictce-5.3.0-mt-sse3.eb b/easybuild/easyconfigs/r/RAxML/RAxML-7.2.6-ictce-5.3.0-mt-sse3.eb
index 4dc53e2ba92437e1ae0b137416daa070d9ed7ef3..153acb74247887356d41d67914a02a1496bc2df6 100644
--- a/easybuild/easyconfigs/r/RAxML/RAxML-7.2.6-ictce-5.3.0-mt-sse3.eb
+++ b/easybuild/easyconfigs/r/RAxML/RAxML-7.2.6-ictce-5.3.0-mt-sse3.eb
@@ -2,14 +2,14 @@ easyblock = 'ConfigureMake'
 
 name = 'RAxML'
 version = '7.2.6'
-versionsuffix ='-mt-sse3'
+versionsuffix = '-mt-sse3'
 
 homepage = 'https://github.com/stamatak/standard-RAxML'
 description = "RAxML search algorithm for maximum likelihood based inference of phylogenetic trees."
 
 toolchain = {'name': 'ictce', 'version': '5.3.0'}
 
-# download from http://sco.h-its.org/exelixis/countSource726.php
+source_urls = ['http://sco.h-its.org/exelixis/resource/download/software/']
 sources = [SOURCE_TAR_BZ2]
 
 skipsteps = ['configure', 'install']
diff --git a/easybuild/easyconfigs/r/RAxML/RAxML-7.2.6-ictce-5.3.0-seq-sse3.eb b/easybuild/easyconfigs/r/RAxML/RAxML-7.2.6-ictce-5.3.0-seq-sse3.eb
index b257e1623324f463a95c621e4c5c5efce40029bd..e7ee2daf46667ff343bd152f4d941b51d342a35a 100644
--- a/easybuild/easyconfigs/r/RAxML/RAxML-7.2.6-ictce-5.3.0-seq-sse3.eb
+++ b/easybuild/easyconfigs/r/RAxML/RAxML-7.2.6-ictce-5.3.0-seq-sse3.eb
@@ -2,14 +2,14 @@ easyblock = 'ConfigureMake'
 
 name = 'RAxML'
 version = '7.2.6'
-versionsuffix ='-seq-sse3'
+versionsuffix = '-seq-sse3'
 
 homepage = 'https://github.com/stamatak/standard-RAxML'
 description = "RAxML search algorithm for maximum likelihood based inference of phylogenetic trees."
 
 toolchain = {'name': 'ictce', 'version': '5.3.0'}
 
-# download from http://sco.h-its.org/exelixis/countSource726.php
+source_urls = ['http://sco.h-its.org/exelixis/resource/download/software/']
 sources = [SOURCE_TAR_BZ2]
 
 skipsteps = ['configure', 'install']
diff --git a/easybuild/easyconfigs/r/RAxML/RAxML-7.7.5-goolf-1.4.10-hybrid-sse3.eb b/easybuild/easyconfigs/r/RAxML/RAxML-7.7.5-goolf-1.4.10-hybrid-sse3.eb
index e836b4e2bd66d439879a565a73f1436fd52c8ef9..d053b3dc21b0d5e455c1541b6662bcd38a0733ec 100644
--- a/easybuild/easyconfigs/r/RAxML/RAxML-7.7.5-goolf-1.4.10-hybrid-sse3.eb
+++ b/easybuild/easyconfigs/r/RAxML/RAxML-7.7.5-goolf-1.4.10-hybrid-sse3.eb
@@ -2,7 +2,7 @@ easyblock = 'ConfigureMake'
 
 name = 'RAxML'
 version = '7.7.5'
-versionsuffix ='-hybrid-sse3'
+versionsuffix = '-hybrid-sse3'
 
 homepage = 'https://github.com/stamatak/standard-RAxML'
 description = "RAxML search algorithm for maximum likelihood based inference of phylogenetic trees."
diff --git a/easybuild/easyconfigs/r/RAxML/RAxML-7.7.5-goolf-1.4.10-mpi-sse3.eb b/easybuild/easyconfigs/r/RAxML/RAxML-7.7.5-goolf-1.4.10-mpi-sse3.eb
index b5fb5192305222e595e4398f4a35194da298db48..575001db8dcb37ae2efc8a459e9dae31cafd59ea 100644
--- a/easybuild/easyconfigs/r/RAxML/RAxML-7.7.5-goolf-1.4.10-mpi-sse3.eb
+++ b/easybuild/easyconfigs/r/RAxML/RAxML-7.7.5-goolf-1.4.10-mpi-sse3.eb
@@ -2,7 +2,7 @@ easyblock = 'ConfigureMake'
 
 name = 'RAxML'
 version = '7.7.5'
-versionsuffix ='-mpi-sse3'
+versionsuffix = '-mpi-sse3'
 
 homepage = 'https://github.com/stamatak/standard-RAxML'
 description = "RAxML search algorithm for maximum likelihood based inference of phylogenetic trees."
diff --git a/easybuild/easyconfigs/r/RAxML/RAxML-7.7.5-goolf-1.4.10-mt-sse3.eb b/easybuild/easyconfigs/r/RAxML/RAxML-7.7.5-goolf-1.4.10-mt-sse3.eb
index 25df746f3e56f836fda176f538ec8dd1fcb833f0..a1fec5b741523f28b4375727b8b4fb2bf336e68b 100644
--- a/easybuild/easyconfigs/r/RAxML/RAxML-7.7.5-goolf-1.4.10-mt-sse3.eb
+++ b/easybuild/easyconfigs/r/RAxML/RAxML-7.7.5-goolf-1.4.10-mt-sse3.eb
@@ -2,7 +2,7 @@ easyblock = 'ConfigureMake'
 
 name = 'RAxML'
 version = '7.7.5'
-versionsuffix ='-mt-sse3'
+versionsuffix = '-mt-sse3'
 
 homepage = 'https://github.com/stamatak/standard-RAxML'
 description = "RAxML search algorithm for maximum likelihood based inference of phylogenetic trees."
diff --git a/easybuild/easyconfigs/r/RAxML/RAxML-7.7.5-goolf-1.4.10-seq-sse3.eb b/easybuild/easyconfigs/r/RAxML/RAxML-7.7.5-goolf-1.4.10-seq-sse3.eb
index 46179d71f4e8fe37195c8cb3818e953b82a34c76..f253cc9c29a0153bf864d5d4e9ce818751092cd3 100644
--- a/easybuild/easyconfigs/r/RAxML/RAxML-7.7.5-goolf-1.4.10-seq-sse3.eb
+++ b/easybuild/easyconfigs/r/RAxML/RAxML-7.7.5-goolf-1.4.10-seq-sse3.eb
@@ -2,7 +2,7 @@ easyblock = 'ConfigureMake'
 
 name = 'RAxML'
 version = '7.7.5'
-versionsuffix ='-seq-sse3'
+versionsuffix = '-seq-sse3'
 
 homepage = 'https://github.com/stamatak/standard-RAxML'
 description = "RAxML search algorithm for maximum likelihood based inference of phylogenetic trees."
diff --git a/easybuild/easyconfigs/r/RAxML/RAxML-7.7.5-ictce-5.3.0-hybrid-sse3.eb b/easybuild/easyconfigs/r/RAxML/RAxML-7.7.5-ictce-5.3.0-hybrid-sse3.eb
index e82295aeaaf9156d726557ac13eca3e408fc81ca..7eb0b37f64a98ff06d547dc2dcab9e6381d4803a 100644
--- a/easybuild/easyconfigs/r/RAxML/RAxML-7.7.5-ictce-5.3.0-hybrid-sse3.eb
+++ b/easybuild/easyconfigs/r/RAxML/RAxML-7.7.5-ictce-5.3.0-hybrid-sse3.eb
@@ -2,7 +2,7 @@ easyblock = 'ConfigureMake'
 
 name = 'RAxML'
 version = '7.7.5'
-versionsuffix ='-hybrid-sse3'
+versionsuffix = '-hybrid-sse3'
 
 homepage = 'https://github.com/stamatak/standard-RAxML'
 description = "RAxML search algorithm for maximum likelihood based inference of phylogenetic trees."
diff --git a/easybuild/easyconfigs/r/RAxML/RAxML-7.7.5-ictce-5.3.0-mpi-sse3.eb b/easybuild/easyconfigs/r/RAxML/RAxML-7.7.5-ictce-5.3.0-mpi-sse3.eb
index dc746f9bc03a7e91d2988c57f737236c6cd41616..0058765fc566fe88bd8c5a8016197c9e20a0d4ed 100644
--- a/easybuild/easyconfigs/r/RAxML/RAxML-7.7.5-ictce-5.3.0-mpi-sse3.eb
+++ b/easybuild/easyconfigs/r/RAxML/RAxML-7.7.5-ictce-5.3.0-mpi-sse3.eb
@@ -2,7 +2,7 @@ easyblock = 'ConfigureMake'
 
 name = 'RAxML'
 version = '7.7.5'
-versionsuffix ='-mpi-sse3'
+versionsuffix = '-mpi-sse3'
 
 homepage = 'https://github.com/stamatak/standard-RAxML'
 description = "RAxML search algorithm for maximum likelihood based inference of phylogenetic trees."
diff --git a/easybuild/easyconfigs/r/RAxML/RAxML-7.7.5-ictce-5.3.0-mt-sse3.eb b/easybuild/easyconfigs/r/RAxML/RAxML-7.7.5-ictce-5.3.0-mt-sse3.eb
index 6c8a50bbe3c5c95f7dcbe092faf0133b9ce6a6f8..86dab359ac168b915f49b5289e345fc062466847 100644
--- a/easybuild/easyconfigs/r/RAxML/RAxML-7.7.5-ictce-5.3.0-mt-sse3.eb
+++ b/easybuild/easyconfigs/r/RAxML/RAxML-7.7.5-ictce-5.3.0-mt-sse3.eb
@@ -2,7 +2,7 @@ easyblock = 'ConfigureMake'
 
 name = 'RAxML'
 version = '7.7.5'
-versionsuffix ='-mt-sse3'
+versionsuffix = '-mt-sse3'
 
 homepage = 'https://github.com/stamatak/standard-RAxML'
 description = "RAxML search algorithm for maximum likelihood based inference of phylogenetic trees."
diff --git a/easybuild/easyconfigs/r/RAxML/RAxML-7.7.5-ictce-5.3.0-seq-sse3.eb b/easybuild/easyconfigs/r/RAxML/RAxML-7.7.5-ictce-5.3.0-seq-sse3.eb
index 9fb4191bd03ee782d149de22d2ad3ec96a743636..b107d2a11a0fdd0fbe5c5b970963067d78112421 100644
--- a/easybuild/easyconfigs/r/RAxML/RAxML-7.7.5-ictce-5.3.0-seq-sse3.eb
+++ b/easybuild/easyconfigs/r/RAxML/RAxML-7.7.5-ictce-5.3.0-seq-sse3.eb
@@ -2,7 +2,7 @@ easyblock = 'ConfigureMake'
 
 name = 'RAxML'
 version = '7.7.5'
-versionsuffix ='-seq-sse3'
+versionsuffix = '-seq-sse3'
 
 homepage = 'https://github.com/stamatak/standard-RAxML'
 description = "RAxML search algorithm for maximum likelihood based inference of phylogenetic trees."
diff --git a/easybuild/easyconfigs/r/RAxML/RAxML-8.1.1-goolf-1.4.10-mpi-avx.eb b/easybuild/easyconfigs/r/RAxML/RAxML-8.1.1-goolf-1.4.10-mpi-avx.eb
index 34e93e35d82c4b518c5ed37a487d0829daca87c7..d7d22ad5ae512534ec8b26258dc81ed8e4e6e1eb 100644
--- a/easybuild/easyconfigs/r/RAxML/RAxML-8.1.1-goolf-1.4.10-mpi-avx.eb
+++ b/easybuild/easyconfigs/r/RAxML/RAxML-8.1.1-goolf-1.4.10-mpi-avx.eb
@@ -7,7 +7,7 @@ easyblock = 'MakeCp'
 
 name = 'RAxML'
 version = '8.1.1'
-versionsuffix ='-mpi-avx'
+versionsuffix = '-mpi-avx'
 
 homepage = 'https://github.com/stamatak/standard-RAxML'
 description = "RAxML search algorithm for maximum likelihood based inference of phylogenetic trees."
diff --git a/easybuild/easyconfigs/r/RAxML/RAxML-8.1.1-goolf-1.4.10-mpi-sse3.eb b/easybuild/easyconfigs/r/RAxML/RAxML-8.1.1-goolf-1.4.10-mpi-sse3.eb
index 42ce2e4fdd0c6599bcd8ca3e2b67cfaad282c915..dd4462802ce5d12126261b35dc1c345caaba54cc 100644
--- a/easybuild/easyconfigs/r/RAxML/RAxML-8.1.1-goolf-1.4.10-mpi-sse3.eb
+++ b/easybuild/easyconfigs/r/RAxML/RAxML-8.1.1-goolf-1.4.10-mpi-sse3.eb
@@ -7,7 +7,7 @@ easyblock = 'MakeCp'
 
 name = 'RAxML'
 version = '8.1.1'
-versionsuffix ='-mpi-sse3'
+versionsuffix = '-mpi-sse3'
 
 homepage = 'https://github.com/stamatak/standard-RAxML'
 description = "RAxML search algorithm for maximum likelihood based inference of phylogenetic trees."
diff --git a/easybuild/easyconfigs/r/RAxML/RAxML-8.1.1-goolf-1.4.10-mt-avx.eb b/easybuild/easyconfigs/r/RAxML/RAxML-8.1.1-goolf-1.4.10-mt-avx.eb
index 09ffafe613b2e55941c21e0b7243b13ef76e1e10..d55bca8237ce5cfcd771f7dcf7b1f7de69e29e5d 100644
--- a/easybuild/easyconfigs/r/RAxML/RAxML-8.1.1-goolf-1.4.10-mt-avx.eb
+++ b/easybuild/easyconfigs/r/RAxML/RAxML-8.1.1-goolf-1.4.10-mt-avx.eb
@@ -7,7 +7,7 @@ easyblock = 'MakeCp'
 
 name = 'RAxML'
 version = '8.1.1'
-versionsuffix ='-mt-avx'
+versionsuffix = '-mt-avx'
 
 homepage = 'https://github.com/stamatak/standard-RAxML'
 description = "RAxML search algorithm for maximum likelihood based inference of phylogenetic trees."
diff --git a/easybuild/easyconfigs/r/RAxML/RAxML-8.1.1-goolf-1.4.10-mt-sse3.eb b/easybuild/easyconfigs/r/RAxML/RAxML-8.1.1-goolf-1.4.10-mt-sse3.eb
index 305c9c94a640a137e4fa53ec7c66c53194891c21..859f2adbb769c0db2637c92807494c16453d13cf 100644
--- a/easybuild/easyconfigs/r/RAxML/RAxML-8.1.1-goolf-1.4.10-mt-sse3.eb
+++ b/easybuild/easyconfigs/r/RAxML/RAxML-8.1.1-goolf-1.4.10-mt-sse3.eb
@@ -7,7 +7,7 @@ easyblock = 'MakeCp'
 
 name = 'RAxML'
 version = '8.1.1'
-versionsuffix ='-mt-sse3'
+versionsuffix = '-mt-sse3'
 
 homepage = 'https://github.com/stamatak/standard-RAxML'
 description = "RAxML search algorithm for maximum likelihood based inference of phylogenetic trees."
diff --git a/easybuild/easyconfigs/r/RAxML/RAxML-8.2.4-intel-2015b-hybrid-avx.eb b/easybuild/easyconfigs/r/RAxML/RAxML-8.2.4-intel-2015b-hybrid-avx.eb
index 21edb6b26415de1cce34db37ba016bac85618db5..32f1d767ad8258ccf8f77dc08b3feee52aff8393 100644
--- a/easybuild/easyconfigs/r/RAxML/RAxML-8.2.4-intel-2015b-hybrid-avx.eb
+++ b/easybuild/easyconfigs/r/RAxML/RAxML-8.2.4-intel-2015b-hybrid-avx.eb
@@ -2,7 +2,7 @@ easyblock = 'MakeCp'
 
 name = 'RAxML'
 version = '8.2.4'
-versionsuffix ='-hybrid-avx'
+versionsuffix = '-hybrid-avx'
 
 homepage = 'https://github.com/stamatak/standard-RAxML'
 description = "RAxML search algorithm for maximum likelihood based inference of phylogenetic trees."
diff --git a/easybuild/easyconfigs/r/RAxML/RAxML-8.2.4-intel-2015b-hybrid-avx2.eb b/easybuild/easyconfigs/r/RAxML/RAxML-8.2.4-intel-2015b-hybrid-avx2.eb
index 4a164f580e70ba1eb8f07e0df266992a27d17e14..8ee726adbf023cd0067872b7a3a6573abc145e34 100644
--- a/easybuild/easyconfigs/r/RAxML/RAxML-8.2.4-intel-2015b-hybrid-avx2.eb
+++ b/easybuild/easyconfigs/r/RAxML/RAxML-8.2.4-intel-2015b-hybrid-avx2.eb
@@ -2,7 +2,7 @@ easyblock = 'MakeCp'
 
 name = 'RAxML'
 version = '8.2.4'
-versionsuffix ='-hybrid-avx2'
+versionsuffix = '-hybrid-avx2'
 
 homepage = 'https://github.com/stamatak/standard-RAxML'
 description = "RAxML search algorithm for maximum likelihood based inference of phylogenetic trees."
diff --git a/easybuild/easyconfigs/r/RAxML/RAxML-8.2.4-intel-2015b-hybrid-sse3.eb b/easybuild/easyconfigs/r/RAxML/RAxML-8.2.4-intel-2015b-hybrid-sse3.eb
index 2bd6afbde94898599cf703600abfa2f5af4173e7..1f3cc9523c1ba291907cbeb2716840616f03f9e4 100644
--- a/easybuild/easyconfigs/r/RAxML/RAxML-8.2.4-intel-2015b-hybrid-sse3.eb
+++ b/easybuild/easyconfigs/r/RAxML/RAxML-8.2.4-intel-2015b-hybrid-sse3.eb
@@ -2,7 +2,7 @@ easyblock = 'MakeCp'
 
 name = 'RAxML'
 version = '8.2.4'
-versionsuffix ='-hybrid-sse3'
+versionsuffix = '-hybrid-sse3'
 
 homepage = 'https://github.com/stamatak/standard-RAxML'
 description = "RAxML search algorithm for maximum likelihood based inference of phylogenetic trees."
diff --git a/easybuild/easyconfigs/r/RNAz/RNAz-2.1-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/r/RNAz/RNAz-2.1-goalf-1.1.0-no-OFED.eb
index f2f5762ddaa8048d4a78158e3a089e2879797d5d..5f373bcc46a71384f21ce6e739442aa4baf20beb 100644
--- a/easybuild/easyconfigs/r/RNAz/RNAz-2.1-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/r/RNAz/RNAz-2.1-goalf-1.1.0-no-OFED.eb
@@ -26,8 +26,8 @@ sources = [SOURCE_TAR_GZ]
 source_urls = ['http://www.tbi.univie.ac.at/~wash/%s' % name]
 
 sanity_check_paths = {
-                      'files': ['bin/RNAz'],
-                      'dirs': []
-                     }
+    'files': ['bin/RNAz'],
+    'dirs': []
+}
 
 moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/r/RNAz/RNAz-2.1-goolf-1.4.10.eb b/easybuild/easyconfigs/r/RNAz/RNAz-2.1-goolf-1.4.10.eb
index c2b6fa1b2b9c609a98adb4ab8b41df98bb5e5983..2155ac1e7630e81bc4d2f5322ff8eddac08e01b5 100644
--- a/easybuild/easyconfigs/r/RNAz/RNAz-2.1-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/r/RNAz/RNAz-2.1-goolf-1.4.10.eb
@@ -26,8 +26,8 @@ sources = [SOURCE_TAR_GZ]
 source_urls = ['http://www.tbi.univie.ac.at/~wash/%s' % name]
 
 sanity_check_paths = {
-                      'files': ['bin/RNAz'],
-                      'dirs': []
-                     }
+    'files': ['bin/RNAz'],
+    'dirs': []
+}
 
 moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/r/RNAz/RNAz-2.1-ictce-4.0.6.eb b/easybuild/easyconfigs/r/RNAz/RNAz-2.1-ictce-4.0.6.eb
index 7db22131266334af00df94a8e58d1aef137adc62..71400b6f392a6695e0cfe75373a043e9401e6d2a 100644
--- a/easybuild/easyconfigs/r/RNAz/RNAz-2.1-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/r/RNAz/RNAz-2.1-ictce-4.0.6.eb
@@ -26,8 +26,8 @@ sources = [SOURCE_TAR_GZ]
 source_urls = ['http://www.tbi.univie.ac.at/~wash/%s' % name]
 
 sanity_check_paths = {
-                      'files': ['bin/RNAz'],
-                      'dirs': []
-                     }
+    'files': ['bin/RNAz'],
+    'dirs': []
+}
 
 moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/r/RNAz/RNAz-2.1-ictce-5.3.0.eb b/easybuild/easyconfigs/r/RNAz/RNAz-2.1-ictce-5.3.0.eb
index 32c6bcbc4b66d72df75c58d9ba3acbee663d0749..03f3c66babb1946ee19c480e4023d4c2784d3c83 100644
--- a/easybuild/easyconfigs/r/RNAz/RNAz-2.1-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/r/RNAz/RNAz-2.1-ictce-5.3.0.eb
@@ -27,8 +27,8 @@ sources = [SOURCE_TAR_GZ]
 source_urls = ['http://www.tbi.univie.ac.at/~wash/%s' % name]
 
 sanity_check_paths = {
-                      'files': ['bin/RNAz'],
-                      'dirs': []
-                     }
+    'files': ['bin/RNAz'],
+    'dirs': []
+}
 
 moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/r/ROOT/ROOT-v5.34.01-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/r/ROOT/ROOT-v5.34.01-goalf-1.1.0-no-OFED.eb
index 304bbf99c8c3bbff2260a56ca96c4bef76ca1a97..b1ee5419da4952428458934238ae5d12a50f29af 100644
--- a/easybuild/easyconfigs/r/ROOT/ROOT-v5.34.01-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/r/ROOT/ROOT-v5.34.01-goalf-1.1.0-no-OFED.eb
@@ -6,7 +6,7 @@ description = """The ROOT system provides a set of OO frameworks with all the fu
     needed to handle and analyze large amounts of data in a very efficient way."""
 
 toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
-toolchainopts = {'pic':True}
+toolchainopts = {'pic': True}
 
 sources = ['%s_%s.source.tar.gz' % (name.lower(), version)]
 source_urls = ['ftp://root.cern.ch/root/']
@@ -18,7 +18,7 @@ dependencies = [
     ('GSL', '1.15'),
     ('libxml2', '2.8.0', '-%s-%s' % (python, pyver)),
     (python, pyver),
-    ]
+]
 
 # architecture
 arch = 'linuxx8664gcc'
diff --git a/easybuild/easyconfigs/r/ROOT/ROOT-v5.34.01-goolf-1.4.10.eb b/easybuild/easyconfigs/r/ROOT/ROOT-v5.34.01-goolf-1.4.10.eb
index c771b391bb4efa3da9607a9b55dd86f132122ceb..4e14ff0190bb88af2cd54be20f320bdba0c80f7a 100644
--- a/easybuild/easyconfigs/r/ROOT/ROOT-v5.34.01-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/r/ROOT/ROOT-v5.34.01-goolf-1.4.10.eb
@@ -6,7 +6,7 @@ description = """The ROOT system provides a set of OO frameworks with all the fu
 needed to handle and analyze large amounts of data in a very efficient way."""
 
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
-toolchainopts = {'pic':True}
+toolchainopts = {'pic': True}
 
 sources = ['%s_%s.source.tar.gz' % (name.lower(), version)]
 source_urls = ['ftp://root.cern.ch/root/']
@@ -15,10 +15,10 @@ python = 'Python'
 pyver = '2.7.3'
 
 dependencies = [
-                ('GSL', '1.15'),
-                ('libxml2', '2.8.0', '-%s-%s' % (python, pyver)),
-                (python, pyver),
-               ]
+    ('GSL', '1.15'),
+    ('libxml2', '2.8.0', '-%s-%s' % (python, pyver)),
+    (python, pyver),
+]
 
 # architecture
 arch = 'linuxx8664gcc'
diff --git a/easybuild/easyconfigs/r/ROOT/ROOT-v5.34.01-ictce-4.0.6.eb b/easybuild/easyconfigs/r/ROOT/ROOT-v5.34.01-ictce-4.0.6.eb
index 55aab9105bb4ba04c0f61cdd8149937dcd468165..6ac9d3d52c2f63fbac8ff5665131795b62670ada 100644
--- a/easybuild/easyconfigs/r/ROOT/ROOT-v5.34.01-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/r/ROOT/ROOT-v5.34.01-ictce-4.0.6.eb
@@ -13,7 +13,7 @@ source_urls = ['ftp://root.cern.ch/root/']
 patches = [
     'configure_FftwFromMkl_28.patch',
     'icc_ifort_v12.patch'
-    ]
+]
 
 python = 'Python'
 pyver = '2.7.3'
@@ -22,7 +22,7 @@ dependencies = [
     ('GSL', '1.15'),
     ('libxml2', '2.8.0', '-%s-%s' % (python, pyver)),
     (python, pyver),
-    ]
+]
 
 # architecture
 arch = 'linuxx8664icc'
diff --git a/easybuild/easyconfigs/r/ROOT/ROOT-v5.34.01-intel-2015a.eb b/easybuild/easyconfigs/r/ROOT/ROOT-v5.34.01-intel-2015a.eb
index c0e1e4e91ecf6043c611b3321f00e8db5a8bf421..a65a7332782025aeb8d5e3c97c0146c9a0a81c6e 100644
--- a/easybuild/easyconfigs/r/ROOT/ROOT-v5.34.01-intel-2015a.eb
+++ b/easybuild/easyconfigs/r/ROOT/ROOT-v5.34.01-intel-2015a.eb
@@ -22,7 +22,7 @@ dependencies = [
     ('GSL', '1.15'),
     ('libxml2', '2.8.0', '-%s-%s' % (python, pyver)),
     (python, pyver),
-    ]
+]
 
 # architecture
 arch = 'linuxx8664icc'
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 d832fcca9366fa93f06bd29f4f976a6ce7805871..d0bbd7da765642af019f23f747fb780a86329269 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
@@ -3,7 +3,7 @@
 # Swiss Institute of Bioinformatics
 # Biozentrum - University of Basel
 
-easyblock='MakeCp'
+easyblock = 'MakeCp'
 
 name = 'RSEQtools'
 version = '0.6'
diff --git a/easybuild/easyconfigs/r/rSeq/rSeq-0.2.0-goolf-1.4.10.eb b/easybuild/easyconfigs/r/rSeq/rSeq-0.2.0-goolf-1.4.10.eb
index 21ca0b75f99b034a99d6b185dcdbaa83f61e46bb..515ad4d74a56684ec38f4cc1faa6f368b1942a3c 100644
--- a/easybuild/easyconfigs/r/rSeq/rSeq-0.2.0-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/r/rSeq/rSeq-0.2.0-goolf-1.4.10.eb
@@ -3,7 +3,7 @@
 # Swiss Institute of Bioinformatics
 # Biozentrum - University of Basel
 
-easyblock='MakeCp'
+easyblock = 'MakeCp'
 
 name = 'rSeq'
 version = '0.2.0'
diff --git a/easybuild/easyconfigs/r/randrproto/randrproto-1.5.0-intel-2015b.eb b/easybuild/easyconfigs/r/randrproto/randrproto-1.5.0-intel-2015b.eb
index 2e61ea7155eec71f0efb9bea445f0645b9300e4a..cb2cc76a3b8e79dcc4f91cee0e9f2f684b141640 100644
--- a/easybuild/easyconfigs/r/randrproto/randrproto-1.5.0-intel-2015b.eb
+++ b/easybuild/easyconfigs/r/randrproto/randrproto-1.5.0-intel-2015b.eb
@@ -12,8 +12,8 @@ sources = [SOURCE_TAR_GZ]
 source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
 
 sanity_check_paths = {
-    'files' : ['include/X11/extensions/%s' % x for x in ['randr.h', 'randrproto.h']],
-    'dirs' : [],
+    'files': ['include/X11/extensions/%s' % x for x in ['randr.h', 'randrproto.h']],
+    'dirs': [],
 }
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/r/renderproto/renderproto-0.11-foss-2014b.eb b/easybuild/easyconfigs/r/renderproto/renderproto-0.11-foss-2014b.eb
index f073ec9749dfeba00799770340fde85dcf17c55e..3119cd29b721b57ae53f946768735dedd3331478 100644
--- a/easybuild/easyconfigs/r/renderproto/renderproto-0.11-foss-2014b.eb
+++ b/easybuild/easyconfigs/r/renderproto/renderproto-0.11-foss-2014b.eb
@@ -13,8 +13,8 @@ sources = [SOURCE_TAR_GZ]
 source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
 
 sanity_check_paths = {
-    'files' : ['include/X11/extensions/%s' % x for x in ['render.h', 'renderproto.h']],
-    'dirs' : [],
+    'files': ['include/X11/extensions/%s' % x for x in ['render.h', 'renderproto.h']],
+    'dirs': [],
 }
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/r/renderproto/renderproto-0.11-intel-2014b.eb b/easybuild/easyconfigs/r/renderproto/renderproto-0.11-intel-2014b.eb
index 34ed4ccca7e3d0564de360ffb0d3e4d59b0d75e7..9d7f0c2a916d893acf619aebfdf89b6d32ca8ac5 100644
--- a/easybuild/easyconfigs/r/renderproto/renderproto-0.11-intel-2014b.eb
+++ b/easybuild/easyconfigs/r/renderproto/renderproto-0.11-intel-2014b.eb
@@ -13,8 +13,8 @@ sources = [SOURCE_TAR_GZ]
 source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
 
 sanity_check_paths = {
-    'files' : ['include/X11/extensions/%s' % x for x in ['render.h', 'renderproto.h']],
-    'dirs' : [],
+    'files': ['include/X11/extensions/%s' % x for x in ['render.h', 'renderproto.h']],
+    'dirs': [],
 }
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/r/renderproto/renderproto-0.11-intel-2015a.eb b/easybuild/easyconfigs/r/renderproto/renderproto-0.11-intel-2015a.eb
index b1d493612160c91e60b7fcce5028a0979d756d47..87042e0e65a33495253997ade34dbd8fe1e928e5 100644
--- a/easybuild/easyconfigs/r/renderproto/renderproto-0.11-intel-2015a.eb
+++ b/easybuild/easyconfigs/r/renderproto/renderproto-0.11-intel-2015a.eb
@@ -13,8 +13,8 @@ sources = [SOURCE_TAR_GZ]
 source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
 
 sanity_check_paths = {
-    'files' : ['include/X11/extensions/%s' % x for x in ['render.h', 'renderproto.h']],
-    'dirs' : [],
+    'files': ['include/X11/extensions/%s' % x for x in ['render.h', 'renderproto.h']],
+    'dirs': [],
 }
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/r/renderproto/renderproto-0.11-intel-2015b.eb b/easybuild/easyconfigs/r/renderproto/renderproto-0.11-intel-2015b.eb
index 6d58ade80ab8eb186f3e9f907275c1041689b3cf..b16c201ac171d94b2b57a1b4f50ff493b9835986 100644
--- a/easybuild/easyconfigs/r/renderproto/renderproto-0.11-intel-2015b.eb
+++ b/easybuild/easyconfigs/r/renderproto/renderproto-0.11-intel-2015b.eb
@@ -13,8 +13,8 @@ sources = [SOURCE_TAR_GZ]
 source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
 
 sanity_check_paths = {
-    'files' : ['include/X11/extensions/%s' % x for x in ['render.h', 'renderproto.h']],
-    'dirs' : [],
+    'files': ['include/X11/extensions/%s' % x for x in ['render.h', 'renderproto.h']],
+    'dirs': [],
 }
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/r/rpmrebuild/rpmrebuild-2.11.eb b/easybuild/easyconfigs/r/rpmrebuild/rpmrebuild-2.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..5b2154b1464bc23344220edc8de9c09fccc8b7c2
--- /dev/null
+++ b/easybuild/easyconfigs/r/rpmrebuild/rpmrebuild-2.11.eb
@@ -0,0 +1,32 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2016 Forschungszentrum Juelich GmbH
+# Authors::   Damian Alvarez <d.alvarez@fz-juelich.de>
+# License::   MIT/GPL
+# $Id$
+##
+
+easyblock = "Tarball"
+
+name = "rpmrebuild"
+version = "2.11"
+
+homepage = 'http://rpmrebuild.sourceforge.net/'
+description = """rpmrebuild is a tool to build an RPM file from a package that has already been 
+   installed in a basic use"""
+
+toolchain = {'version': 'dummy', 'name': 'dummy'}
+
+source_urls = [SOURCEFORGE_SOURCE]
+sources = [SOURCELOWER_TAR_GZ]
+
+modextrapaths = {'PATH': ['']}
+modextravars = {'RPMREBUILD_ROOT_DIR': '%(installdir)s'}
+
+sanity_check_paths = {
+    'files': ["rpmrebuild"],
+    'dirs': []
+}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/s/SCOTCH/SCOTCH-6.0.4-foss-2016a.eb b/easybuild/easyconfigs/s/SCOTCH/SCOTCH-6.0.4-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..431d04e9dfb3bd4d55d8441f4ffcaf5779ec8e28
--- /dev/null
+++ b/easybuild/easyconfigs/s/SCOTCH/SCOTCH-6.0.4-foss-2016a.eb
@@ -0,0 +1,14 @@
+name = 'SCOTCH'
+version = '6.0.4'
+
+homepage = 'http://gforge.inria.fr/projects/scotch/'
+description = """Software package and libraries for sequential and parallel graph partitioning,
+static mapping, and sparse matrix block ordering, and sequential mesh and hypergraph partitioning."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+toolchainopts = {'pic': True}
+
+source_urls = ['http://gforge.inria.fr/frs/download.php/file/34618/']
+sources = ['%(namelower)s_%(version)s.tar.gz']
+
+moduleclass = 'math'
diff --git a/easybuild/easyconfigs/s/SDCC/SDCC-3.3.0.eb b/easybuild/easyconfigs/s/SDCC/SDCC-3.3.0.eb
index a74b423aa792495aa92e13fd860422090872cfed..cd91fac4e45cd58bc024da27d09b3de8b5574afc 100644
--- a/easybuild/easyconfigs/s/SDCC/SDCC-3.3.0.eb
+++ b/easybuild/easyconfigs/s/SDCC/SDCC-3.3.0.eb
@@ -39,6 +39,6 @@ sanity_check_paths = {
     'dirs': []
 }
 
-runtest = 'installcheck' # N.B. the current Makefile contains just a placeholder and is empty
+runtest = 'installcheck'  # N.B. the current Makefile contains just a placeholder and is empty
 
 moduleclass = 'compiler'
diff --git a/easybuild/easyconfigs/s/SIBELia/SIBELia-3.0.4-goolf-1.4.10.eb b/easybuild/easyconfigs/s/SIBELia/SIBELia-3.0.4-goolf-1.4.10.eb
index 2bba2e77c88f80f45d30d31efc7314674ca314bd..5c52477972cba40987510d41d6c6d1581400dbc4 100644
--- a/easybuild/easyconfigs/s/SIBELia/SIBELia-3.0.4-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/s/SIBELia/SIBELia-3.0.4-goolf-1.4.10.eb
@@ -31,4 +31,3 @@ sanity_check_paths = {
 }
 
 moduleclass = 'bio'
-
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 aaac9462ce8b4c52dcf1dea3a9699165053aeb62..49346a9d1c3e09f8e1e220b9bb52badcb4ee6be3 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
@@ -26,7 +26,8 @@ configopts += "--destdir %%(installdir)s/lib/python%s/site-packages" % pyshortve
 
 sanity_check_paths = {
     'files': ['bin/sip', 'include/sip.h'] +
-             ['lib/python%s/site-packages/%s' % (pyshortver, x) for x in ['sip.%s' % SHLIB_EXT, 'sipconfig.py', 'sipdistutils.py']],
+             ['lib/python%s/site-packages/%s' % (pyshortver, x)
+              for x in ['sip.%s' % SHLIB_EXT, 'sipconfig.py', 'sipdistutils.py']],
     'dirs': [],
 }
 
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 f0dcc913e9fb3e115beaad19ae6791aa87a04e98..e61810f5fd719695670a96fcaf4a9a49f47f70e9 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
@@ -26,7 +26,8 @@ configopts += "--destdir %%(installdir)s/lib/python%s/site-packages" % pyshortve
 
 sanity_check_paths = {
     'files': ['bin/sip', 'include/sip.h'] +
-             ['lib/python%s/site-packages/%s' % (pyshortver, x) for x in ['sip.%s' % SHLIB_EXT, 'sipconfig.py', 'sipdistutils.py']],
+             ['lib/python%s/site-packages/%s' % (pyshortver, x)
+              for x in ['sip.%s' % SHLIB_EXT, 'sipconfig.py', 'sipdistutils.py']],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/s/SIP/SIP-4.16.8-foss-2015a-Python-2.7.9.eb b/easybuild/easyconfigs/s/SIP/SIP-4.16.8-foss-2015a-Python-2.7.9.eb
index af473b7d9f72de62dbbe3323de344f21e039429e..eed3ec9cee2bcd3192cf420e752025087e5edb23 100644
--- a/easybuild/easyconfigs/s/SIP/SIP-4.16.8-foss-2015a-Python-2.7.9.eb
+++ b/easybuild/easyconfigs/s/SIP/SIP-4.16.8-foss-2015a-Python-2.7.9.eb
@@ -26,7 +26,8 @@ configopts += "--destdir %%(installdir)s/lib/python%s/site-packages" % pyshortve
 
 sanity_check_paths = {
     'files': ['bin/sip', 'include/sip.h'] +
-             ['lib/python%s/site-packages/%s' % (pyshortver, x) for x in ['sip.%s' % SHLIB_EXT, 'sipconfig.py', 'sipdistutils.py']],
+             ['lib/python%s/site-packages/%s' % (pyshortver, x)
+              for x in ['sip.%s' % SHLIB_EXT, 'sipconfig.py', 'sipdistutils.py']],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/s/SIP/SIP-4.16.8-intel-2014b-Python-2.7.8.eb b/easybuild/easyconfigs/s/SIP/SIP-4.16.8-intel-2014b-Python-2.7.8.eb
index 2fb045fa8473050462adc32184c0498b4fbd1d3a..517317038b1a4653c3d031057ad96987c5d28491 100644
--- a/easybuild/easyconfigs/s/SIP/SIP-4.16.8-intel-2014b-Python-2.7.8.eb
+++ b/easybuild/easyconfigs/s/SIP/SIP-4.16.8-intel-2014b-Python-2.7.8.eb
@@ -26,7 +26,8 @@ configopts += "--destdir %%(installdir)s/lib/python%s/site-packages" % pyshortve
 
 sanity_check_paths = {
     'files': ['bin/sip', 'include/sip.h'] +
-             ['lib/python%s/site-packages/%s' % (pyshortver, x) for x in ['sip.%s' % SHLIB_EXT, 'sipconfig.py', 'sipdistutils.py']],
+             ['lib/python%s/site-packages/%s' % (pyshortver, x)
+              for x in ['sip.%s' % SHLIB_EXT, 'sipconfig.py', 'sipdistutils.py']],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/s/SIP/SIP-4.16.8-intel-2015a-Python-2.7.9.eb b/easybuild/easyconfigs/s/SIP/SIP-4.16.8-intel-2015a-Python-2.7.9.eb
index 457e09c556d3839bf09c0704374fed1f0d53bd4a..b2e1479cba032d634c25261e72fadb3f0e4bd471 100644
--- a/easybuild/easyconfigs/s/SIP/SIP-4.16.8-intel-2015a-Python-2.7.9.eb
+++ b/easybuild/easyconfigs/s/SIP/SIP-4.16.8-intel-2015a-Python-2.7.9.eb
@@ -26,7 +26,8 @@ configopts += "--destdir %%(installdir)s/lib/python%s/site-packages" % pyshortve
 
 sanity_check_paths = {
     'files': ['bin/sip', 'include/sip.h'] +
-             ['lib/python%s/site-packages/%s' % (pyshortver, x) for x in ['sip.%s' % SHLIB_EXT, 'sipconfig.py', 'sipdistutils.py']],
+             ['lib/python%s/site-packages/%s' % (pyshortver, x)
+              for x in ['sip.%s' % SHLIB_EXT, 'sipconfig.py', 'sipdistutils.py']],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/s/SMALT/SMALT-0.7.5-goolf-1.4.10.eb b/easybuild/easyconfigs/s/SMALT/SMALT-0.7.5-goolf-1.4.10.eb
index a2509710abb36633ea4cdbab38200147041e4b3e..ed0395223c0f987f3529b023e390ac0bd151bfa7 100644
--- a/easybuild/easyconfigs/s/SMALT/SMALT-0.7.5-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/s/SMALT/SMALT-0.7.5-goolf-1.4.10.eb
@@ -25,7 +25,7 @@ source_urls = [SOURCEFORGE_SOURCE]
 sources = [SOURCELOWER_TAR_GZ]
 
 sanity_check_paths = {
-    'files': ['bin/%s' % x for x in ['simread', 'smalt', 'mixreads','readstats']],
+    'files': ['bin/%s' % x for x in ['simread', 'smalt', 'mixreads', 'readstats']],
     'dirs': []
 }
 
diff --git a/easybuild/easyconfigs/s/SMALT/SMALT-0.7.5-ictce-5.3.0.eb b/easybuild/easyconfigs/s/SMALT/SMALT-0.7.5-ictce-5.3.0.eb
index 97b9385894700888f26c8d1ee8d341218b4013ad..16d05cf3415d4629cc248f5ca3056d83d4f86e8d 100644
--- a/easybuild/easyconfigs/s/SMALT/SMALT-0.7.5-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/s/SMALT/SMALT-0.7.5-ictce-5.3.0.eb
@@ -25,7 +25,7 @@ source_urls = [SOURCEFORGE_SOURCE]
 sources = [SOURCELOWER_TAR_GZ]
 
 sanity_check_paths = {
-    'files': ['bin/%s' % x for x in ['simread', 'smalt', 'mixreads','readstats']],
+    'files': ['bin/%s' % x for x in ['simread', 'smalt', 'mixreads', 'readstats']],
     'dirs': []
 }
 
diff --git a/easybuild/easyconfigs/s/SOAPaligner/SOAPaligner-2.21_Linux-x86_64.eb b/easybuild/easyconfigs/s/SOAPaligner/SOAPaligner-2.21_Linux-x86_64.eb
index 8bbd1d0d4394863c506a4a64b84353afac663b64..67f7cd27da2a5e2797fae76372864fe19f2b66c9 100644
--- a/easybuild/easyconfigs/s/SOAPaligner/SOAPaligner-2.21_Linux-x86_64.eb
+++ b/easybuild/easyconfigs/s/SOAPaligner/SOAPaligner-2.21_Linux-x86_64.eb
@@ -3,7 +3,7 @@
 # Swiss Institute of Bioinformatics
 # Biozentrum - University of Basel
 
-easyblock='MakeCp'
+easyblock = 'MakeCp'
 
 name = 'SOAPaligner'
 version = '2.21'
diff --git a/easybuild/easyconfigs/s/SOAPdenovo2/SOAPdenovo2-r240-goolf-1.4.10.eb b/easybuild/easyconfigs/s/SOAPdenovo2/SOAPdenovo2-r240-goolf-1.4.10.eb
index 195190a77619db498d95f35c14164bd062f1a1fe..7e9207e3f13e4ff146a351b62b9b96ae44342721 100644
--- a/easybuild/easyconfigs/s/SOAPdenovo2/SOAPdenovo2-r240-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/s/SOAPdenovo2/SOAPdenovo2-r240-goolf-1.4.10.eb
@@ -30,7 +30,7 @@ patches = ['SOAPdenovo2-fix-unistd-includes.patch']
 # parallel build is broken
 maxparallel = 1
 
-files_to_copy = [(['SOAPdenovo-127mer','SOAPdenovo-63mer'], 'bin')]
+files_to_copy = [(['SOAPdenovo-127mer', 'SOAPdenovo-63mer'], 'bin')]
 
 sanity_check_paths = {
     'files': ['bin/SOAPdenovo-63mer', 'bin/SOAPdenovo-127mer'],
diff --git a/easybuild/easyconfigs/s/SOAPdenovo2/SOAPdenovo2-r240-ictce-5.3.0.eb b/easybuild/easyconfigs/s/SOAPdenovo2/SOAPdenovo2-r240-ictce-5.3.0.eb
index c597bc06013814ad5f0a41af6e5dba9360ffe073..e74ff0cb830354a3fe9c5540e96fc400d7f0f5a8 100644
--- a/easybuild/easyconfigs/s/SOAPdenovo2/SOAPdenovo2-r240-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/s/SOAPdenovo2/SOAPdenovo2-r240-ictce-5.3.0.eb
@@ -30,7 +30,7 @@ patches = ['SOAPdenovo2-fix-unistd-includes.patch']
 # parallel build is broken
 maxparallel = 1
 
-files_to_copy = [(['SOAPdenovo-127mer','SOAPdenovo-63mer'], 'bin')]
+files_to_copy = [(['SOAPdenovo-127mer', 'SOAPdenovo-63mer'], 'bin')]
 
 sanity_check_paths = {
     'files': ['bin/SOAPdenovo-63mer', 'bin/SOAPdenovo-127mer'],
diff --git a/easybuild/easyconfigs/s/SOAPdenovo2/SOAPdenovo2-r240-ictce-5.5.0.eb b/easybuild/easyconfigs/s/SOAPdenovo2/SOAPdenovo2-r240-ictce-5.5.0.eb
index 003c59365170505e603557b0feadd5a08baf167b..6e27e80aadd2c7f0c519d9472912f83dd237de8b 100644
--- a/easybuild/easyconfigs/s/SOAPdenovo2/SOAPdenovo2-r240-ictce-5.5.0.eb
+++ b/easybuild/easyconfigs/s/SOAPdenovo2/SOAPdenovo2-r240-ictce-5.5.0.eb
@@ -30,7 +30,7 @@ patches = ['SOAPdenovo2-fix-unistd-includes.patch']
 # parallel build is broken
 maxparallel = 1
 
-files_to_copy = [(['SOAPdenovo-127mer','SOAPdenovo-63mer'], 'bin')]
+files_to_copy = [(['SOAPdenovo-127mer', 'SOAPdenovo-63mer'], 'bin')]
 
 sanity_check_paths = {
     'files': ['bin/SOAPdenovo-63mer', 'bin/SOAPdenovo-127mer'],
diff --git a/easybuild/easyconfigs/s/SOAPdenovo2/SOAPdenovo2-r240-intel-2015a.eb b/easybuild/easyconfigs/s/SOAPdenovo2/SOAPdenovo2-r240-intel-2015a.eb
index 16d7b494290b828c8771b6c35822d2e742a139a1..d56a8ae4dd5e607609c7570cc5bf9ee1ff492e30 100644
--- a/easybuild/easyconfigs/s/SOAPdenovo2/SOAPdenovo2-r240-intel-2015a.eb
+++ b/easybuild/easyconfigs/s/SOAPdenovo2/SOAPdenovo2-r240-intel-2015a.eb
@@ -30,7 +30,7 @@ patches = ['SOAPdenovo2-fix-unistd-includes.patch']
 # parallel build is broken
 maxparallel = 1
 
-files_to_copy = [(['SOAPdenovo-127mer','SOAPdenovo-63mer'], 'bin')]
+files_to_copy = [(['SOAPdenovo-127mer', 'SOAPdenovo-63mer'], 'bin')]
 
 sanity_check_paths = {
     'files': ['bin/SOAPdenovo-63mer', 'bin/SOAPdenovo-127mer'],
diff --git a/easybuild/easyconfigs/s/SOAPdenovo2/SOAPdenovo2-r240-intel-2015b.eb b/easybuild/easyconfigs/s/SOAPdenovo2/SOAPdenovo2-r240-intel-2015b.eb
index 829511351f715ef62f061b67fe3afed53f7c161c..4948eef292fb7e84a996817ffa1546e1c429a759 100644
--- a/easybuild/easyconfigs/s/SOAPdenovo2/SOAPdenovo2-r240-intel-2015b.eb
+++ b/easybuild/easyconfigs/s/SOAPdenovo2/SOAPdenovo2-r240-intel-2015b.eb
@@ -30,7 +30,7 @@ patches = ['SOAPdenovo2-fix-unistd-includes.patch']
 # parallel build is broken
 maxparallel = 1
 
-files_to_copy = [(['SOAPdenovo-127mer','SOAPdenovo-63mer'], 'bin')]
+files_to_copy = [(['SOAPdenovo-127mer', 'SOAPdenovo-63mer'], 'bin')]
 
 sanity_check_paths = {
     'files': ['bin/SOAPdenovo-63mer', 'bin/SOAPdenovo-127mer'],
diff --git a/easybuild/easyconfigs/s/SPAdes/SPAdes-3.0.0-goolf-1.4.10.eb b/easybuild/easyconfigs/s/SPAdes/SPAdes-3.0.0-goolf-1.4.10.eb
index f8b0fa21e01623fd57e4ce26f8b1ee5cb8695971..ab6bd52347d6edb3be4ed7f7600a344124f7b54c 100644
--- a/easybuild/easyconfigs/s/SPAdes/SPAdes-3.0.0-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/s/SPAdes/SPAdes-3.0.0-goolf-1.4.10.eb
@@ -33,4 +33,3 @@ sanity_check_paths = {
 }
 
 moduleclass = 'bio'
-
diff --git a/easybuild/easyconfigs/s/SPAdes/SPAdes-3.1.0-goolf-1.4.10.eb b/easybuild/easyconfigs/s/SPAdes/SPAdes-3.1.0-goolf-1.4.10.eb
index 59c84e5a287b01575ec5a9507e7fd99d5cf2cf06..5eb12170f691dabeff20d40076ee7ea346823cb8 100644
--- a/easybuild/easyconfigs/s/SPAdes/SPAdes-3.1.0-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/s/SPAdes/SPAdes-3.1.0-goolf-1.4.10.eb
@@ -33,4 +33,3 @@ sanity_check_paths = {
 }
 
 moduleclass = 'bio'
-
diff --git a/easybuild/easyconfigs/s/SQLite/SQLite-3.10.0-foss-2015a.eb b/easybuild/easyconfigs/s/SQLite/SQLite-3.10.0-foss-2015a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..c435d47a74ea04b3011d892f400f39138b4b3fc6
--- /dev/null
+++ b/easybuild/easyconfigs/s/SQLite/SQLite-3.10.0-foss-2015a.eb
@@ -0,0 +1,40 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2012-2014 Uni.Lu/LCSB, NTUA
+# Authors::   Fotis Georgatos <fotis@cern.ch>
+# License::   MIT/GPL
+# $Id$
+#
+# This work implements a part of the HPCBIOS project and is a component of the policy:
+# http://hpcbios.readthedocs.org/en/latest/
+##
+
+easyblock = 'ConfigureMake'
+
+name = 'SQLite'
+version = '3.10.0'
+
+homepage = 'http://www.sqlite.org/'
+description = 'SQLite: SQL Database Engine in a C Library'
+
+toolchain = {'name': 'foss', 'version': '2015a'}
+
+source_urls = ['http://www.sqlite.org/2016/']
+version_minor_etc = version.split('.')[1:]
+version_minor_etc += '0' * (3 - len(version_minor_etc))
+version_str = '%(version_major)s' + ''.join('%02d' % int(x) for x in version_minor_etc)
+sources = ['sqlite-autoconf-%s.tar.gz' % version_str]
+
+dependencies = [
+    ('libreadline', '6.3'),
+    ('Tcl', '8.6.4'),
+]
+
+sanity_check_paths = {
+    'files': ['bin/sqlite3', 'include/sqlite3ext.h', 'include/sqlite3.h', 'lib/libsqlite3.a',
+              'lib/libsqlite3.%s' % SHLIB_EXT],
+    'dirs': ['lib/pkgconfig'],
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/s/SQLite/SQLite-3.8.6-ictce-5.5.0.eb b/easybuild/easyconfigs/s/SQLite/SQLite-3.8.6-ictce-5.5.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..ac855e7cba016f96354e6ee4dfd766b2c7842125
--- /dev/null
+++ b/easybuild/easyconfigs/s/SQLite/SQLite-3.8.6-ictce-5.5.0.eb
@@ -0,0 +1,37 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2012-2014 Uni.Lu/LCSB, NTUA
+# Authors::   Fotis Georgatos <fotis@cern.ch>
+# License::   MIT/GPL
+# $Id$
+#
+# This work implements a part of the HPCBIOS project and is a component of the policy:
+# http://hpcbios.readthedocs.org/en/latest/
+##
+
+easyblock = 'ConfigureMake'
+
+name = 'SQLite'
+version = '3.8.6'
+
+homepage = 'http://www.sqlite.org/'
+description = "SQLite: SQL Database Engine in a C Library"
+
+toolchain = {'name': 'ictce', 'version': '5.5.0'}
+
+# eg. http://www.sqlite.org/2014/sqlite-autoconf-3080600.tar.gz
+source_urls = ['http://www.sqlite.org/2014/']
+sources = ['sqlite-autoconf-%s0%s0%s00.tar.gz' % tuple(version.split('.'))]  # very weird way to calculate your filename
+
+dependencies = [
+    ('libreadline', '6.2'),
+    ('Tcl', '8.6.2'),
+]
+
+sanity_check_paths = {
+    'files': ['bin/sqlite3'],
+    'dirs': [],
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/s/STAR-Fusion/STAR-Fusion-0.6.0-goolf-1.4.10-Perl-5.16.3.eb b/easybuild/easyconfigs/s/STAR-Fusion/STAR-Fusion-0.6.0-goolf-1.4.10-Perl-5.16.3.eb
new file mode 100644
index 0000000000000000000000000000000000000000..58fcb58c2d997271b71012d66deeb987ae390a7e
--- /dev/null
+++ b/easybuild/easyconfigs/s/STAR-Fusion/STAR-Fusion-0.6.0-goolf-1.4.10-Perl-5.16.3.eb
@@ -0,0 +1,52 @@
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+# Author: Pablo Escobar Lopez
+# sciCORE - University of Basel
+# SIB Swiss Institute of Bioinformatics 
+
+easyblock = 'Tarball'
+
+name = 'STAR-Fusion'
+version = '0.6.0'
+versionsuffix = '-Perl-%(perlver)s'
+
+homepage = 'https://github.com/STAR-Fusion/STAR-Fusion'
+description = """STAR-Fusion uses the STAR aligner to identify candidate fusion transcripts 
+ supported by Illumina reads. STAR-Fusion further processes the output generated by the STAR aligner 
+ to map junction reads and spanning reads to a reference annotation set."""
+
+toolchain = {'name': 'goolf', 'version': '1.4.10'}
+
+source_urls = ['https://github.com/STAR-Fusion/STAR-Fusion/releases/download/v%(version)s/']
+sources = ['%(name)s_v%(version)s.FULL.tar.gz']
+
+dependencies = [
+    ('Perl', '5.16.3'),
+    ('STAR', '2.5.1b'),
+]
+
+# these are the perl libraries dependencies
+exts_defaultclass = 'PerlModule'
+exts_filter = ("perldoc -lm %(ext_name)s ", "")
+
+exts_list = [
+    ('Set::IntervalTree', '0.10', {
+         'source_tmpl': 'Set-IntervalTree-0.10.tar.gz',
+         'source_urls': ['https://cpan.metacpan.org/authors/id/B/BE/BENBOOTH/'],
+    }),
+    ('DB_File', '1.835', {
+         'source_tmpl': 'DB_File-1.835.tar.gz',
+         'source_urls': ['https://cpan.metacpan.org/authors/id/P/PM/PMQS/'],
+    }),
+]
+
+modextrapaths = {
+    'PATH': "", # add installation dir to PATH
+    'PERL5LIB': 'lib/perl5/site_perl/%(perlver)s/'
+}
+
+sanity_check_paths = {
+    'files': ['STAR-Fusion'],
+    'dirs': []
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/s/STAR/STAR-2.5.1b-foss-2015b.eb b/easybuild/easyconfigs/s/STAR/STAR-2.5.1b-foss-2015b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..8c14b0d9a69c352b99e03f406050c1a1109ed790
--- /dev/null
+++ b/easybuild/easyconfigs/s/STAR/STAR-2.5.1b-foss-2015b.eb
@@ -0,0 +1,34 @@
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+# Author: Pablo Escobar Lopez
+# sciCORE - University of Basel
+# SIB Swiss Institute of Bioinformatics
+# Author: Adam Huffman
+# The Francis Crick Institute
+
+easyblock = 'MakeCp'
+
+name = 'STAR'
+version = '2.5.1b' 
+
+homepage = 'https://code.google.com/p/rna-star/'
+description = """ STAR aligns RNA-seq reads to a reference genome using 
+ uncompressed suffix arrays. """
+
+toolchain = {'name': 'foss', 'version': '2015b'}
+
+source_urls = ['https://github.com/alexdobin/STAR/archive/']
+sources = ['%(version)s.tar.gz']
+
+# a binary is provided with the source files. We delete it
+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': [],
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/s/STAR/STAR-2.5.1b-goolf-1.4.10.eb b/easybuild/easyconfigs/s/STAR/STAR-2.5.1b-goolf-1.4.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..35b1c5e236557cbea57fd160521a3b063394a55d
--- /dev/null
+++ b/easybuild/easyconfigs/s/STAR/STAR-2.5.1b-goolf-1.4.10.eb
@@ -0,0 +1,32 @@
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+# Author: Pablo Escobar Lopez
+# sciCORE - University of Basel
+# SIB Swiss Institute of Bioinformatics
+
+easyblock = 'MakeCp'
+
+name = 'STAR'
+version = '2.5.1b' 
+
+homepage = 'https://code.google.com/p/rna-star/'
+description = """ STAR aligns RNA-seq reads to a reference genome using 
+ uncompressed suffix arrays. """
+
+toolchain = {'name': 'goolf', 'version': '1.4.10'}
+
+source_urls = ['https://github.com/alexdobin/STAR/archive/']
+sources = ['%(version)s.tar.gz']
+
+# a binary is provided with the source files. We delete it
+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': [],
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/s/STREAM/STREAM-5.10-intel-2015a.eb b/easybuild/easyconfigs/s/STREAM/STREAM-5.10-intel-2015a.eb
index ede241886da5e42eb7b568a4f8243254148ae0ac..79841574824ac44256ab1cc50406beface9a6f6a 100644
--- a/easybuild/easyconfigs/s/STREAM/STREAM-5.10-intel-2015a.eb
+++ b/easybuild/easyconfigs/s/STREAM/STREAM-5.10-intel-2015a.eb
@@ -17,7 +17,7 @@ checksums = ['dd2941e3a28ff90a79b571273c10aacf']
 skipsteps = ['source']
 
 # 10 million array elements (1000 runs): requires ~224MB of memory
-cmds_str =  "$CC $CFLAGS %(source)s -mcmodel=large -DSTREAM_ARRAY_SIZE=10000000 -DNTIMES=1000 -o stream_1Kx10M; "
+cmds_str = "$CC $CFLAGS %(source)s -mcmodel=large -DSTREAM_ARRAY_SIZE=10000000 -DNTIMES=1000 -o stream_1Kx10M; "
 # 100 million array elements (1000 runs): requires ~2.2GiB of memory
 cmds_str += "$CC $CFLAGS %(source)s -mcmodel=large -DSTREAM_ARRAY_SIZE=100000000 -DNTIMES=1000 -o stream_1Kx100M; "
 # 1 billion array elements (1000 runs): requires ~22.4 GiB of memory
diff --git a/easybuild/easyconfigs/s/SWIG/SWIG-3.0.8-foss-2015a-Python-2.7.11.eb b/easybuild/easyconfigs/s/SWIG/SWIG-3.0.8-foss-2015a-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..9b8e4b5df8cc16cb2885b32b30d69f6aa3060be1
--- /dev/null
+++ b/easybuild/easyconfigs/s/SWIG/SWIG-3.0.8-foss-2015a-Python-2.7.11.eb
@@ -0,0 +1,23 @@
+name = 'SWIG'
+version = '3.0.8'
+
+homepage = 'http://www.swig.org/'
+description = """SWIG is a software development tool that connects programs written in C and C++ with
+ a variety of high-level programming languages."""
+
+toolchain = {'name': 'foss', 'version': '2015a'}
+toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
+
+source_urls = [SOURCEFORGE_SOURCE]
+sources = [SOURCELOWER_TAR_GZ]
+
+python = 'Python'
+pythonversion = '2.7.11'
+versionsuffix = '-%s-%s' % (python, pythonversion)
+
+dependencies = [
+    (python, pythonversion),
+    ('PCRE', '8.37'),
+]
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-1.8.0-gompi-1.1.0-no-OFED-ATLAS-3.8.4-LAPACK-3.4.0-BLACS-1.1.eb b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-1.8.0-gompi-1.1.0-no-OFED-ATLAS-3.8.4-LAPACK-3.4.0-BLACS-1.1.eb
index 210286f19db809377ab1291cf6c930e7d2ae266f..6c10e15771375503e4184dd6d8fb7cca44b4350c 100644
--- a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-1.8.0-gompi-1.1.0-no-OFED-ATLAS-3.8.4-LAPACK-3.4.0-BLACS-1.1.eb
+++ b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-1.8.0-gompi-1.1.0-no-OFED-ATLAS-3.8.4-LAPACK-3.4.0-BLACS-1.1.eb
@@ -31,7 +31,7 @@ dependencies = [
     (blacslib, blacsver)
 ]
 
-## parallel build tends to fail, so disabling it
+# parallel build tends to fail, so disabling it
 parallel = 1
 
 moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-1.8.0-iiqmpi-3.3.0-ACML-5.3.0-ifort-64bit-BLACS-1.1.eb b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-1.8.0-iiqmpi-3.3.0-ACML-5.3.0-ifort-64bit-BLACS-1.1.eb
index adc08604576685e7874cfae6f1f9e530c2320d70..fc37a0988b99e90383149d2f4edcb441753d48ed 100644
--- a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-1.8.0-iiqmpi-3.3.0-ACML-5.3.0-ifort-64bit-BLACS-1.1.eb
+++ b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-1.8.0-iiqmpi-3.3.0-ACML-5.3.0-ifort-64bit-BLACS-1.1.eb
@@ -21,7 +21,7 @@ blacsn = 'BLACS'
 blacsv = '1.1'
 blacs = "-%s-%s" % (blacsn, blacsv)
 
-versionsuffix = "%s%s"% (acml, blacs)
+versionsuffix = "%s%s" % (acml, blacs)
 
 # both icc and ifort are needed, but ifort is not part of icc 'toolkit'
 dependencies = [
diff --git a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.1-gompi-1.1.0-no-OFED-ATLAS-3.8.4-LAPACK-3.4.0.eb b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.1-gompi-1.1.0-no-OFED-ATLAS-3.8.4-LAPACK-3.4.0.eb
index 269cb64669464104bdf417d6a7dd39aca3414117..f837989fc46308d3b649386f52b708a01fc549b2 100644
--- a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.1-gompi-1.1.0-no-OFED-ATLAS-3.8.4-LAPACK-3.4.0.eb
+++ b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.1-gompi-1.1.0-no-OFED-ATLAS-3.8.4-LAPACK-3.4.0.eb
@@ -26,7 +26,7 @@ dependencies = [
     (lapacklib, lapackver)
 ]
 
-## parallel build tends to fail, so disabling it
+# parallel build tends to fail, so disabling it
 parallel = 1
 
 moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-cgmpich-1.1.6-OpenBLAS-0.2.6-LAPACK-3.4.2.eb b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-cgmpich-1.1.6-OpenBLAS-0.2.6-LAPACK-3.4.2.eb
index 904f9125acf070f723adbbda9438a0a02f892279..ac50d0ef91e1d20c2aca198100dc1f750022e5f7 100644
--- a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-cgmpich-1.1.6-OpenBLAS-0.2.6-LAPACK-3.4.2.eb
+++ b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-cgmpich-1.1.6-OpenBLAS-0.2.6-LAPACK-3.4.2.eb
@@ -19,7 +19,7 @@ versionsuffix = "-%s-%s%s" % (blaslib, blasver, blassuff)
 
 dependencies = [(blaslib, blasver, blassuff)]
 
-## parallel build tends to fail, so disabling it
+# parallel build tends to fail, so disabling it
 parallel = 1
 
 moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-cgmvapich2-1.1.12rc1-OpenBLAS-0.2.6-LAPACK-3.4.2.eb b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-cgmvapich2-1.1.12rc1-OpenBLAS-0.2.6-LAPACK-3.4.2.eb
index df6546768d28176aadb22c00cd5b7a4809171320..4f7213c206e1b3fe10070521271f27ab9e1372fb 100644
--- a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-cgmvapich2-1.1.12rc1-OpenBLAS-0.2.6-LAPACK-3.4.2.eb
+++ b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-cgmvapich2-1.1.12rc1-OpenBLAS-0.2.6-LAPACK-3.4.2.eb
@@ -19,7 +19,7 @@ versionsuffix = "-%s-%s%s" % (blaslib, blasver, blassuff)
 
 dependencies = [(blaslib, blasver, blassuff)]
 
-## parallel build tends to fail, so disabling it
+# parallel build tends to fail, so disabling it
 parallel = 1
 
 moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-cgompi-1.1.7-OpenBLAS-0.2.6-LAPACK-3.4.2.eb b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-cgompi-1.1.7-OpenBLAS-0.2.6-LAPACK-3.4.2.eb
index d0e28920491631b6aab0336b3f0c1b63eacdb9c5..abdf8ee53892e9a955b7f97ee172eaade9094236 100644
--- a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-cgompi-1.1.7-OpenBLAS-0.2.6-LAPACK-3.4.2.eb
+++ b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-cgompi-1.1.7-OpenBLAS-0.2.6-LAPACK-3.4.2.eb
@@ -19,7 +19,7 @@ versionsuffix = "-%s-%s%s" % (blaslib, blasver, blassuff)
 
 dependencies = [(blaslib, blasver, blassuff)]
 
-## parallel build tends to fail, so disabling it
+# parallel build tends to fail, so disabling it
 parallel = 1
 
 moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gmpich-1.4.8-OpenBLAS-0.2.6-LAPACK-3.4.2.eb b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gmpich-1.4.8-OpenBLAS-0.2.6-LAPACK-3.4.2.eb
index 532548937666f377ddd0b56838ee0aea21acd732..18d673bc52fc5de4532134c43e5a6297de370b98 100644
--- a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gmpich-1.4.8-OpenBLAS-0.2.6-LAPACK-3.4.2.eb
+++ b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gmpich-1.4.8-OpenBLAS-0.2.6-LAPACK-3.4.2.eb
@@ -19,7 +19,7 @@ versionsuffix = "-%s-%s%s" % (blaslib, blasver, blassuff)
 
 dependencies = [(blaslib, blasver, blassuff)]
 
-## parallel build tends to fail, so disabling it
+# parallel build tends to fail, so disabling it
 parallel = 1
 
 moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gmvapich2-1.7.12-OpenBLAS-0.2.6-LAPACK-3.4.2.eb b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gmvapich2-1.7.12-OpenBLAS-0.2.6-LAPACK-3.4.2.eb
index 9f4ac4da774624a89460d74a48ce13e2e41d276c..7b0e530a27df823cef82219a9cc3c84140983102 100644
--- a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gmvapich2-1.7.12-OpenBLAS-0.2.6-LAPACK-3.4.2.eb
+++ b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gmvapich2-1.7.12-OpenBLAS-0.2.6-LAPACK-3.4.2.eb
@@ -19,7 +19,7 @@ versionsuffix = "-%s-%s%s" % (blaslib, blasver, blassuff)
 
 dependencies = [(blaslib, blasver, blassuff)]
 
-## parallel build tends to fail, so disabling it
+# parallel build tends to fail, so disabling it
 parallel = 1
 
 moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gmvapich2-1.7.12rc1-OpenBLAS-0.2.6-LAPACK-3.4.2.eb b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gmvapich2-1.7.12rc1-OpenBLAS-0.2.6-LAPACK-3.4.2.eb
index 4e2c7a11615538272f092ec26aa44466a48b0634..fbd7ceb3422a66fb8dde30ebd4c237b7736a4a8d 100644
--- a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gmvapich2-1.7.12rc1-OpenBLAS-0.2.6-LAPACK-3.4.2.eb
+++ b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gmvapich2-1.7.12rc1-OpenBLAS-0.2.6-LAPACK-3.4.2.eb
@@ -19,7 +19,7 @@ versionsuffix = "-%s-%s%s" % (blaslib, blasver, blassuff)
 
 dependencies = [(blaslib, blasver, blassuff)]
 
-## parallel build tends to fail, so disabling it
+# parallel build tends to fail, so disabling it
 parallel = 1
 
 moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gmvapich2-1.7.20-OpenBLAS-0.2.13-LAPACK-3.5.0.eb b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gmvapich2-1.7.20-OpenBLAS-0.2.13-LAPACK-3.5.0.eb
index 4792a692ea6ef2b1e54ee7ef90fce78abc9cb5c8..cae50d0f3e48648b8d2ae6013dfaef1a25a5c033 100644
--- a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gmvapich2-1.7.20-OpenBLAS-0.2.13-LAPACK-3.5.0.eb
+++ b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gmvapich2-1.7.20-OpenBLAS-0.2.13-LAPACK-3.5.0.eb
@@ -19,7 +19,7 @@ versionsuffix = "-%s-%s%s" % (blaslib, blasver, blassuff)
 
 dependencies = [(blaslib, blasver, blassuff, ('GCC', '4.8.4'))]
 
-## parallel build tends to fail, so disabling it
+# parallel build tends to fail, so disabling it
 parallel = 1
 
 moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gmvapich2-1.7.9a2-ACML-5.2.0-gfortran-64bit.eb b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gmvapich2-1.7.9a2-ACML-5.2.0-gfortran-64bit.eb
index b8ff206dfbae2ce0c6a8680a1785dbf67761f143..2756603966a51409e79e606506c8828021b212fa 100644
--- a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gmvapich2-1.7.9a2-ACML-5.2.0-gfortran-64bit.eb
+++ b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gmvapich2-1.7.9a2-ACML-5.2.0-gfortran-64bit.eb
@@ -19,7 +19,7 @@ versionsuffix = "-%s-%s%s" % (blas_lapack_lib, blas_lapack_ver, blas_lapack_suff
 
 dependencies = [(blas_lapack_lib, blas_lapack_ver, blas_lapack_suff, True)]
 
-## parallel build tends to fail, so disabling it
+# parallel build tends to fail, so disabling it
 parallel = 1
 
 moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.3.12-OpenBLAS-0.2.6-LAPACK-3.4.2.eb b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.3.12-OpenBLAS-0.2.6-LAPACK-3.4.2.eb
index 04f36f4b91043a273458db989e81da07eb55037c..a669a672e136f4ed398df119a2df03d7211532de 100644
--- a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.3.12-OpenBLAS-0.2.6-LAPACK-3.4.2.eb
+++ b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.3.12-OpenBLAS-0.2.6-LAPACK-3.4.2.eb
@@ -19,7 +19,7 @@ versionsuffix = "-%s-%s%s" % (blaslib, blasver, blassuff)
 
 dependencies = [(blaslib, blasver, blassuff)]
 
-## parallel build tends to fail, so disabling it
+# parallel build tends to fail, so disabling it
 parallel = 1
 
 moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.4.10-OpenBLAS-0.2.6-LAPACK-3.4.2.eb b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.4.10-OpenBLAS-0.2.6-LAPACK-3.4.2.eb
index 8f7ad295d1679bb629c2c6814132c9e2ebd9056f..0cb313ec9d1fa730a26cc21283c43e9203d16882 100644
--- a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.4.10-OpenBLAS-0.2.6-LAPACK-3.4.2.eb
+++ b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.4.10-OpenBLAS-0.2.6-LAPACK-3.4.2.eb
@@ -19,7 +19,7 @@ versionsuffix = "-%s-%s%s" % (blaslib, blasver, blassuff)
 
 dependencies = [(blaslib, blasver, blassuff)]
 
-## parallel build tends to fail, so disabling it
+# parallel build tends to fail, so disabling it
 parallel = 1
 
 moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.4.10-no-OFED-OpenBLAS-0.2.6-LAPACK-3.4.2.eb b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.4.10-no-OFED-OpenBLAS-0.2.6-LAPACK-3.4.2.eb
index 5e0e14ba2c64e7905766ad2233ffcb166e204df3..a9d14c30102921ab382811d2121a45ac100d24f2 100644
--- a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.4.10-no-OFED-OpenBLAS-0.2.6-LAPACK-3.4.2.eb
+++ b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.4.10-no-OFED-OpenBLAS-0.2.6-LAPACK-3.4.2.eb
@@ -19,7 +19,7 @@ versionsuffix = "-%s-%s%s" % (blaslib, blasver, blassuff)
 
 dependencies = [(blaslib, blasver, blassuff)]
 
-## parallel build tends to fail, so disabling it
+# parallel build tends to fail, so disabling it
 parallel = 1
 
 moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.5.12-ATLAS-3.10.1-LAPACK-3.4.2.eb b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.5.12-ATLAS-3.10.1-LAPACK-3.4.2.eb
index 7e8bf14eee4c7025dbd1ad0fafa848d4ddcc4889..d9714deb739fcf749b394d0b2fa747ede16cb90d 100644
--- a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.5.12-ATLAS-3.10.1-LAPACK-3.4.2.eb
+++ b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.5.12-ATLAS-3.10.1-LAPACK-3.4.2.eb
@@ -26,7 +26,7 @@ dependencies = [
     (lapacklib, lapackver),
 ]
 
-## parallel build tends to fail, so disabling it
+# parallel build tends to fail, so disabling it
 parallel = 1
 
 moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.5.12-no-OFED-ATLAS-3.10.1-LAPACK-3.4.2.eb b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.5.12-no-OFED-ATLAS-3.10.1-LAPACK-3.4.2.eb
index 68e8936860fc692c3ac8a77a87557a7338380e46..cdbebf7d1b7d3cf961bb003272ba83231d2c466b 100644
--- a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.5.12-no-OFED-ATLAS-3.10.1-LAPACK-3.4.2.eb
+++ b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.5.12-no-OFED-ATLAS-3.10.1-LAPACK-3.4.2.eb
@@ -26,7 +26,7 @@ dependencies = [
     (lapacklib, lapackver),
 ]
 
-## parallel build tends to fail, so disabling it
+# parallel build tends to fail, so disabling it
 parallel = 1
 
 moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.5.14-OpenBLAS-0.2.8-LAPACK-3.5.0.eb b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.5.14-OpenBLAS-0.2.8-LAPACK-3.5.0.eb
index 2a0a7e12ce3769e1fd5da5567a2782fc070cce8e..17094c0c6f6683dcc303f60776018adc312c57c2 100644
--- a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.5.14-OpenBLAS-0.2.8-LAPACK-3.5.0.eb
+++ b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.5.14-OpenBLAS-0.2.8-LAPACK-3.5.0.eb
@@ -19,7 +19,7 @@ versionsuffix = "-%s-%s%s" % (blaslib, blasver, blassuff)
 
 dependencies = [(blaslib, blasver, blassuff)]
 
-## parallel build tends to fail, so disabling it
+# parallel build tends to fail, so disabling it
 parallel = 1
 
 moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.5.14-no-OFED-OpenBLAS-0.2.8-LAPACK-3.5.0.eb b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.5.14-no-OFED-OpenBLAS-0.2.8-LAPACK-3.5.0.eb
index b55976ccac840121dba0eb27ab881fd3d738a37d..7815082cf245cab1370a02c78eb9dfdbd37d35ed 100644
--- a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.5.14-no-OFED-OpenBLAS-0.2.8-LAPACK-3.5.0.eb
+++ b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.5.14-no-OFED-OpenBLAS-0.2.8-LAPACK-3.5.0.eb
@@ -19,7 +19,7 @@ versionsuffix = "-%s-%s%s" % (blaslib, blasver, blassuff)
 
 dependencies = [(blaslib, blasver, blassuff)]
 
-## parallel build tends to fail, so disabling it
+# parallel build tends to fail, so disabling it
 parallel = 1
 
 moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.5.16-OpenBLAS-0.2.13-LAPACK-3.5.0.eb b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.5.16-OpenBLAS-0.2.13-LAPACK-3.5.0.eb
index a52473e7ffedd519f37acacfd370df8c95defd6c..a53493b9f7309b6ff769e1268b0dc2f26878c3d7 100644
--- a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.5.16-OpenBLAS-0.2.13-LAPACK-3.5.0.eb
+++ b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.5.16-OpenBLAS-0.2.13-LAPACK-3.5.0.eb
@@ -19,7 +19,7 @@ versionsuffix = "-%s-%s%s" % (blaslib, blasver, blassuff)
 
 dependencies = [(blaslib, blasver, blassuff)]
 
-## parallel build tends to fail, so disabling it
+# parallel build tends to fail, so disabling it
 parallel = 1
 
 moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.6.10-OpenBLAS-0.2.8-LAPACK-3.4.2.eb b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.6.10-OpenBLAS-0.2.8-LAPACK-3.4.2.eb
index b037ae507c78abd134539b40553afd2e5ff33e04..98a3aca262d6fac037bf03886e5537db6097c441 100644
--- a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.6.10-OpenBLAS-0.2.8-LAPACK-3.4.2.eb
+++ b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.6.10-OpenBLAS-0.2.8-LAPACK-3.4.2.eb
@@ -19,7 +19,7 @@ versionsuffix = "-%s-%s%s" % (blaslib, blasver, blassuff)
 
 dependencies = [(blaslib, blasver, blassuff)]
 
-## parallel build tends to fail, so disabling it
+# parallel build tends to fail, so disabling it
 parallel = 1
 
 moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.7.20-OpenBLAS-0.2.13-LAPACK-3.5.0.eb b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.7.20-OpenBLAS-0.2.13-LAPACK-3.5.0.eb
index 94cfcc38e51b361f6e73e87483987d5ca769c20a..4f12059c031a8440d017989dace07b2b110cfead 100644
--- a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.7.20-OpenBLAS-0.2.13-LAPACK-3.5.0.eb
+++ b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-1.7.20-OpenBLAS-0.2.13-LAPACK-3.5.0.eb
@@ -19,7 +19,7 @@ versionsuffix = "-%s-%s%s" % (blaslib, blasver, blassuff)
 
 dependencies = [(blaslib, blasver, blassuff, ('GCC', '4.8.4'))]
 
-## parallel build tends to fail, so disabling it
+# parallel build tends to fail, so disabling it
 parallel = 1
 
 moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-2014b-OpenBLAS-0.2.9-LAPACK-3.5.0.eb b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-2014b-OpenBLAS-0.2.9-LAPACK-3.5.0.eb
index 134eb47e4de2da9b02c4aa66da3eea2caa648f9b..f560b92bf9ccb9390ecbcddce68e64c9a0647571 100644
--- a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-2014b-OpenBLAS-0.2.9-LAPACK-3.5.0.eb
+++ b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-2014b-OpenBLAS-0.2.9-LAPACK-3.5.0.eb
@@ -19,7 +19,7 @@ versionsuffix = "-%s-%s%s" % (blaslib, blasver, blassuff)
 
 dependencies = [(blaslib, blasver, blassuff, ('GCC', '4.8.3'))]
 
-## parallel build tends to fail, so disabling it
+# parallel build tends to fail, so disabling it
 parallel = 1
 
 moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-2015.05-OpenBLAS-0.2.14-LAPACK-3.5.0.eb b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-2015.05-OpenBLAS-0.2.14-LAPACK-3.5.0.eb
index e8390ed236603791e0d1281349dae16f551179a6..f65260e697d06dd856a9963864871de1677538c7 100644
--- a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-2015.05-OpenBLAS-0.2.14-LAPACK-3.5.0.eb
+++ b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-2015.05-OpenBLAS-0.2.14-LAPACK-3.5.0.eb
@@ -19,7 +19,7 @@ versionsuffix = "-%s-%s%s" % (blaslib, blasver, blassuff)
 
 dependencies = [(blaslib, blasver, blassuff, ('GNU', '4.9.2-2.25'))]
 
-## parallel build tends to fail, so disabling it
+# parallel build tends to fail, so disabling it
 parallel = 1
 
 moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-2015a-OpenBLAS-0.2.13-LAPACK-3.5.0.eb b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-2015a-OpenBLAS-0.2.13-LAPACK-3.5.0.eb
index be40d5d1ed370827e04b76ef3e75e42ec0b4e6bc..ed214b72f237f7c071083bcd36569960d7e56a04 100644
--- a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-2015a-OpenBLAS-0.2.13-LAPACK-3.5.0.eb
+++ b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-2015a-OpenBLAS-0.2.13-LAPACK-3.5.0.eb
@@ -19,7 +19,7 @@ versionsuffix = "-%s-%s%s" % (blaslib, blasver, blassuff)
 
 dependencies = [(blaslib, blasver, blassuff, ('GCC', '4.9.2'))]
 
-## parallel build tends to fail, so disabling it
+# parallel build tends to fail, so disabling it
 parallel = 1
 
 moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-2015b-OpenBLAS-0.2.14-LAPACK-3.5.0.eb b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-2015b-OpenBLAS-0.2.14-LAPACK-3.5.0.eb
index 758c146b8325e485f7ccda335760156c4ac8d0ca..e17684d2a5522c307cbce1a02503c4165c630ef7 100644
--- a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-2015b-OpenBLAS-0.2.14-LAPACK-3.5.0.eb
+++ b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-2015b-OpenBLAS-0.2.14-LAPACK-3.5.0.eb
@@ -19,7 +19,7 @@ versionsuffix = "-%s-%s%s" % (blaslib, blasver, blassuff)
 
 dependencies = [(blaslib, blasver, blassuff, ('GNU', '4.9.3-2.25'))]
 
-## parallel build tends to fail, so disabling it
+# parallel build tends to fail, so disabling it
 parallel = 1
 
 moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-2016a-OpenBLAS-0.2.15-LAPACK-3.6.0.eb b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-2016a-OpenBLAS-0.2.15-LAPACK-3.6.0.eb
index 1326db5fe2ebbbc3616ffbcf9d601b98c1111963..00ff5f97ba50ec32b1f31ff6411991d3877ed351 100644
--- a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-2016a-OpenBLAS-0.2.15-LAPACK-3.6.0.eb
+++ b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-2016a-OpenBLAS-0.2.15-LAPACK-3.6.0.eb
@@ -19,7 +19,7 @@ versionsuffix = "-%s-%s%s" % (blaslib, blasver, blassuff)
 
 dependencies = [(blaslib, blasver, blassuff, ('GCC', '4.9.3-2.25'))]
 
-## parallel build tends to fail, so disabling it
+# parallel build tends to fail, so disabling it
 parallel = 1
 
 moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompic-2.6.10-OpenBLAS-0.2.8-LAPACK-3.4.2.eb b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompic-2.6.10-OpenBLAS-0.2.8-LAPACK-3.4.2.eb
index 77f58e7b27ba1805f0a058652d511b885fa5b2d7..fdc1dfd842e71a2043e8e5ce6b490ac4156bf374 100644
--- a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompic-2.6.10-OpenBLAS-0.2.8-LAPACK-3.4.2.eb
+++ b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompic-2.6.10-OpenBLAS-0.2.8-LAPACK-3.4.2.eb
@@ -19,7 +19,7 @@ versionsuffix = "-%s-%s%s" % (blaslib, blasver, blassuff)
 
 dependencies = [(blaslib, blasver, blassuff)]
 
-## parallel build tends to fail, so disabling it
+# parallel build tends to fail, so disabling it
 parallel = 1
 
 moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gpsmpi-2014.12-OpenBLAS-0.2.12-LAPACK-3.5.0.eb b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gpsmpi-2014.12-OpenBLAS-0.2.12-LAPACK-3.5.0.eb
index ac55389f2d4c1d8e47cd5b7e52f918b0fe035bd5..292ec23d395127d2d3a0e85f20639cf1d2bca918 100644
--- a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gpsmpi-2014.12-OpenBLAS-0.2.12-LAPACK-3.5.0.eb
+++ b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gpsmpi-2014.12-OpenBLAS-0.2.12-LAPACK-3.5.0.eb
@@ -23,8 +23,7 @@ versionsuffix = "-%s-%s%s" % (blaslib, blasver, blassuff)
 
 dependencies = [(blaslib, blasver, blassuff, comp)]
 
-## parallel build tends to fail, so disabling it
+# parallel build tends to fail, so disabling it
 parallel = 1
 
 moduleclass = 'numlib'
-
diff --git a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-iiqmpi-4.4.13-ACML-5.3.1-ifort-64bit.eb b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-iiqmpi-4.4.13-ACML-5.3.1-ifort-64bit.eb
index 325514fe67e763bbdf4e62eae0a96f01cb9f54e0..243f17e8c73969c5e29db032a7a4dd554fb5b076 100644
--- a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-iiqmpi-4.4.13-ACML-5.3.1-ifort-64bit.eb
+++ b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-iiqmpi-4.4.13-ACML-5.3.1-ifort-64bit.eb
@@ -19,7 +19,7 @@ versionsuffix = "-%s-%s%s" % (blas_lapack_lib, blas_lapack_ver, blas_lapack_suff
 
 dependencies = [(blas_lapack_lib, blas_lapack_ver, blas_lapack_suff, True)]
 
-## parallel build tends to fail, so disabling it
+# parallel build tends to fail, so disabling it
 parallel = 1
 
 moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/s/Scalasca/Scalasca-1.4.3-gompi-1.4.12-no-OFED.eb b/easybuild/easyconfigs/s/Scalasca/Scalasca-1.4.3-gompi-1.4.12-no-OFED.eb
index aad8b175e4923a73577043a19fd98dee35ab5836..26b61def41ea708e3bc67eaa99ee54c56c18f737 100644
--- a/easybuild/easyconfigs/s/Scalasca/Scalasca-1.4.3-gompi-1.4.12-no-OFED.eb
+++ b/easybuild/easyconfigs/s/Scalasca/Scalasca-1.4.3-gompi-1.4.12-no-OFED.eb
@@ -27,8 +27,8 @@ dependencies = [
     ('OPARI2', '1.0.7'),
     ('PAPI', '5.2.0'),
     ('PDT', '3.19'),
-# Scalasca cannot handle name changes yet introduced with OTF-1.12.3
-#    ('OTF', '1.12.4'),
+    # Scalasca cannot handle name changes yet introduced with OTF-1.12.3
+    #    ('OTF', '1.12.4'),
 ]
 
 # http://apps.fz-juelich.de/scalasca/releases/scalasca/1.4/dist/scalasca-1.4.3.tar.gz
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 0676f0176618165b22cfce60ac9b080b7a49f058..987ce669c8446b7fca760ad28a2504ca37664ebc 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
@@ -21,8 +21,8 @@ builddependencies = [('SCons', '2.3.6', '-Python-2.7.9')]
 dependencies = [
     ('APR', '1.5.2'),
     ('APR-util', '1.5.4'),
-#   ('OpenSSL', '1.0.1p'),  # OS dependency should be preferred if the os version is more recent then this version, it's
-#   nice to have an up to date openssl for security reasons
+    #   ('OpenSSL', '1.0.1p'),  # OS dependency should be preferred if the os version is more recent then this version, it's
+    #   nice to have an up to date openssl for security reasons
 ]
 
 osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
diff --git a/easybuild/easyconfigs/s/Shapely/Shapely-1.2.15-goalf-1.1.0-no-OFED-Python-2.7.3.eb b/easybuild/easyconfigs/s/Shapely/Shapely-1.2.15-goalf-1.1.0-no-OFED-Python-2.7.3.eb
index 87deeb47fed2b3fe1bf3be70db4e0bc217315531..5221d932735203eecf807b77ae2cc415fdaa589e 100644
--- a/easybuild/easyconfigs/s/Shapely/Shapely-1.2.15-goalf-1.1.0-no-OFED-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/s/Shapely/Shapely-1.2.15-goalf-1.1.0-no-OFED-Python-2.7.3.eb
@@ -19,14 +19,14 @@ pythonshortversion = ".".join(pythonversion.split(".")[:-1])
 versionsuffix = "-%s-%s" % (python, pythonversion)
 
 dependencies = [
-                (python, pythonversion),
-                ('setuptools', '0.6c11', versionsuffix),
-                ('GEOS', '3.3.5'),
-               ]
+    (python, pythonversion),
+    ('setuptools', '0.6c11', versionsuffix),
+    ('GEOS', '3.3.5'),
+]
 
 sanity_check_paths = {
-                      'files': ['lib/python%s/site-packages/site.py' % (pythonshortversion)],
-                      'dirs': []
-                     }
+    'files': ['lib/python%s/site-packages/site.py' % (pythonshortversion)],
+    'dirs': []
+}
 
 moduleclass = 'math'
diff --git a/easybuild/easyconfigs/s/Shapely/Shapely-1.2.15-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/s/Shapely/Shapely-1.2.15-goolf-1.4.10-Python-2.7.3.eb
index 758a4009e5d02bbd4902447a9a92dc7c420e77ce..2aecbeae80ac26d4af4ec0312bcfaf0fda3043fc 100644
--- a/easybuild/easyconfigs/s/Shapely/Shapely-1.2.15-goolf-1.4.10-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/s/Shapely/Shapely-1.2.15-goolf-1.4.10-Python-2.7.3.eb
@@ -19,14 +19,14 @@ pythonshortversion = ".".join(pythonversion.split(".")[:-1])
 versionsuffix = "-%s-%s" % (python, pythonversion)
 
 dependencies = [
-                (python, pythonversion),
-                ('setuptools', '0.6c11', versionsuffix),
-                ('GEOS', '3.3.5'),
-               ]
+    (python, pythonversion),
+    ('setuptools', '0.6c11', versionsuffix),
+    ('GEOS', '3.3.5'),
+]
 
 sanity_check_paths = {
-                      'files': ['lib/python%s/site-packages/site.py' % (pythonshortversion)],
-                      'dirs': []
-                     }
+    'files': ['lib/python%s/site-packages/site.py' % (pythonshortversion)],
+    'dirs': []
+}
 
 moduleclass = 'math'
diff --git a/easybuild/easyconfigs/s/Shapely/Shapely-1.2.15-ictce-4.0.6-Python-2.7.3.eb b/easybuild/easyconfigs/s/Shapely/Shapely-1.2.15-ictce-4.0.6-Python-2.7.3.eb
index b6ecffc690148d3e5e05c6e12f20f22ceaff04d0..ad94a62e1cdb6a479281ac6aab6b3c63b37abfc7 100644
--- a/easybuild/easyconfigs/s/Shapely/Shapely-1.2.15-ictce-4.0.6-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/s/Shapely/Shapely-1.2.15-ictce-4.0.6-Python-2.7.3.eb
@@ -19,14 +19,14 @@ pythonshortversion = ".".join(pythonversion.split(".")[:-1])
 versionsuffix = "-%s-%s" % (python, pythonversion)
 
 dependencies = [
-                (python, pythonversion),
-                ('setuptools', '0.6c11', versionsuffix),
-                ('GEOS', '3.3.5'),
-               ]
+    (python, pythonversion),
+    ('setuptools', '0.6c11', versionsuffix),
+    ('GEOS', '3.3.5'),
+]
 
 sanity_check_paths = {
-                      'files': ['lib/python%s/site-packages/site.py' % (pythonshortversion)],
-                      'dirs': []
-                     }
+    'files': ['lib/python%s/site-packages/site.py' % (pythonshortversion)],
+    'dirs': []
+}
 
 moduleclass = 'math'
diff --git a/easybuild/easyconfigs/s/Shapely/Shapely-1.2.15-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/s/Shapely/Shapely-1.2.15-ictce-5.3.0-Python-2.7.3.eb
index 8727c7a7cbf7d0a1e15448505bbf3c3bb9912abb..1b6cb746c176b5adeb41f17f5d20ef96d877d07c 100644
--- a/easybuild/easyconfigs/s/Shapely/Shapely-1.2.15-ictce-5.3.0-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/s/Shapely/Shapely-1.2.15-ictce-5.3.0-Python-2.7.3.eb
@@ -19,14 +19,14 @@ pythonshortversion = ".".join(pythonversion.split(".")[:-1])
 versionsuffix = "-%s-%s" % (python, pythonversion)
 
 dependencies = [
-                (python, pythonversion),
-                ('setuptools', '0.6c11', versionsuffix),
-                ('GEOS', '3.3.5'),
-               ]
+    (python, pythonversion),
+    ('setuptools', '0.6c11', versionsuffix),
+    ('GEOS', '3.3.5'),
+]
 
 sanity_check_paths = {
-                      'files': ['lib/python%s/site-packages/site.py' % (pythonshortversion)],
-                      'dirs': []
-                     }
+    'files': ['lib/python%s/site-packages/site.py' % (pythonshortversion)],
+    'dirs': []
+}
 
 moduleclass = 'math'
diff --git a/easybuild/easyconfigs/s/Sphinx/Sphinx-1.1.3-goalf-1.1.0-no-OFED-Python-2.7.3.eb b/easybuild/easyconfigs/s/Sphinx/Sphinx-1.1.3-goalf-1.1.0-no-OFED-Python-2.7.3.eb
index b9a94e2e9e79af56c34ebfb76c3b0d7603f87000..520c4a6f15df334a19eec331529dc4a8db8acf70 100644
--- a/easybuild/easyconfigs/s/Sphinx/Sphinx-1.1.3-goalf-1.1.0-no-OFED-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/s/Sphinx/Sphinx-1.1.3-goalf-1.1.0-no-OFED-Python-2.7.3.eb
@@ -27,8 +27,8 @@ dependencies = [(python, pyver),
 runtest = "make test"
 
 sanity_check_paths = {
-                      'files': ["bin/sphinx-%s" % x for x in ["apidoc", "autogen", "build", "quickstart"]],
-                      'dirs': ["lib/python%s/site-packages/%s-%s-py%s.egg" % (pyshortver, name, version, pyshortver)]
-                     }
+    'files': ["bin/sphinx-%s" % x for x in ["apidoc", "autogen", "build", "quickstart"]],
+    'dirs': ["lib/python%s/site-packages/%s-%s-py%s.egg" % (pyshortver, name, version, pyshortver)]
+}
 
 moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/s/Sphinx/Sphinx-1.1.3-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/s/Sphinx/Sphinx-1.1.3-goolf-1.4.10-Python-2.7.3.eb
index 61173fdddde70d4d350f991f4646a2ac2a4db38a..d7ce90b55721c9d55a5b312ad6956dce851029bd 100644
--- a/easybuild/easyconfigs/s/Sphinx/Sphinx-1.1.3-goolf-1.4.10-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/s/Sphinx/Sphinx-1.1.3-goolf-1.4.10-Python-2.7.3.eb
@@ -27,8 +27,8 @@ dependencies = [(python, pyver),
 runtest = "make test"
 
 sanity_check_paths = {
-                      'files': ["bin/sphinx-%s" % x for x in ["apidoc", "autogen", "build", "quickstart"]],
-                      'dirs': ["lib/python%s/site-packages/%s-%s-py%s.egg" % (pyshortver, name, version, pyshortver)]
-                     }
+    'files': ["bin/sphinx-%s" % x for x in ["apidoc", "autogen", "build", "quickstart"]],
+    'dirs': ["lib/python%s/site-packages/%s-%s-py%s.egg" % (pyshortver, name, version, pyshortver)]
+}
 
 moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/s/Sphinx/Sphinx-1.1.3-ictce-4.0.6-Python-2.7.3.eb b/easybuild/easyconfigs/s/Sphinx/Sphinx-1.1.3-ictce-4.0.6-Python-2.7.3.eb
index 069dffe6d0cea4bc996efee769e56a6bf52f0afe..9807eeeeb21a1a4d1ea3b2f62d7fbf76621727cf 100644
--- a/easybuild/easyconfigs/s/Sphinx/Sphinx-1.1.3-ictce-4.0.6-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/s/Sphinx/Sphinx-1.1.3-ictce-4.0.6-Python-2.7.3.eb
@@ -27,8 +27,8 @@ dependencies = [(python, pyver),
 runtest = "make test"
 
 sanity_check_paths = {
-                      'files': ["bin/sphinx-%s" % x for x in ["apidoc", "autogen", "build", "quickstart"]],
-                      'dirs': ["lib/python%s/site-packages/%s-%s-py%s.egg" % (pyshortver, name, version, pyshortver)]
-                     }
+    'files': ["bin/sphinx-%s" % x for x in ["apidoc", "autogen", "build", "quickstart"]],
+    'dirs': ["lib/python%s/site-packages/%s-%s-py%s.egg" % (pyshortver, name, version, pyshortver)]
+}
 
 moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/s/Sphinx/Sphinx-1.1.3-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/s/Sphinx/Sphinx-1.1.3-ictce-5.3.0-Python-2.7.3.eb
index 300df5535fc2dccccc367f8232d14c101a239319..79877de835fbfeb2f7ad715dfdf8dbf3c70feb08 100644
--- a/easybuild/easyconfigs/s/Sphinx/Sphinx-1.1.3-ictce-5.3.0-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/s/Sphinx/Sphinx-1.1.3-ictce-5.3.0-Python-2.7.3.eb
@@ -27,8 +27,8 @@ dependencies = [(python, pyver),
 runtest = "make test"
 
 sanity_check_paths = {
-                      'files': ["bin/sphinx-%s" % x for x in ["apidoc", "autogen", "build", "quickstart"]],
-                      'dirs': ["lib/python%s/site-packages/%s-%s-py%s.egg" % (pyshortver, name, version, pyshortver)]
-                     }
+    'files': ["bin/sphinx-%s" % x for x in ["apidoc", "autogen", "build", "quickstart"]],
+    'dirs': ["lib/python%s/site-packages/%s-%s-py%s.egg" % (pyshortver, name, version, pyshortver)]
+}
 
 moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/s/Stow/Stow-1.3.3-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/s/Stow/Stow-1.3.3-goalf-1.1.0-no-OFED.eb
index 08108a8a47e1d6403f76b9ef0ef8fbc718b68e66..0d2c3773f892039150121b4e10824318b0da8ef2 100644
--- a/easybuild/easyconfigs/s/Stow/Stow-1.3.3-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/s/Stow/Stow-1.3.3-goalf-1.1.0-no-OFED.eb
@@ -24,8 +24,8 @@ source_urls = [GNU_SOURCE]
 toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
 
 sanity_check_paths = {
-                      'files': ['bin/stow'],
-                      'dirs': []
-                     }
+    'files': ['bin/stow'],
+    'dirs': []
+}
 
 moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/s/Stow/Stow-1.3.3-goolf-1.4.10.eb b/easybuild/easyconfigs/s/Stow/Stow-1.3.3-goolf-1.4.10.eb
index bff8348243c9cefbc2d15b4aa148d6eb6fd80ff3..df639eb5dc896a990d7a1bf95fc5f07f3c647023 100644
--- a/easybuild/easyconfigs/s/Stow/Stow-1.3.3-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/s/Stow/Stow-1.3.3-goolf-1.4.10.eb
@@ -24,8 +24,8 @@ source_urls = [GNU_SOURCE]
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 
 sanity_check_paths = {
-                      'files': ['bin/stow'],
-                      'dirs': []
-                     }
+    'files': ['bin/stow'],
+    'dirs': []
+}
 
 moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/s/Stow/Stow-1.3.3-ictce-4.0.6.eb b/easybuild/easyconfigs/s/Stow/Stow-1.3.3-ictce-4.0.6.eb
index 3dacc81151b0e9d0387e558b0d0c2a0b642fe0f3..e7734dc52655a9639d12aa71be2814770bb9be7b 100644
--- a/easybuild/easyconfigs/s/Stow/Stow-1.3.3-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/s/Stow/Stow-1.3.3-ictce-4.0.6.eb
@@ -24,8 +24,8 @@ source_urls = [GNU_SOURCE]
 toolchain = {'version': '4.0.6', 'name': 'ictce'}
 
 sanity_check_paths = {
-                      'files': ['bin/stow'],
-                      'dirs': []
-                     }
+    'files': ['bin/stow'],
+    'dirs': []
+}
 
 moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/s/Stow/Stow-1.3.3-ictce-5.3.0.eb b/easybuild/easyconfigs/s/Stow/Stow-1.3.3-ictce-5.3.0.eb
index 03fc7dd37c7ef8aa8570bbb3ff2deac9cde9d644..43fedd4e90594fcf5df82a1687af5ef14a4a0280 100644
--- a/easybuild/easyconfigs/s/Stow/Stow-1.3.3-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/s/Stow/Stow-1.3.3-ictce-5.3.0.eb
@@ -25,8 +25,8 @@ source_urls = [GNU_SOURCE]
 toolchain = {'name': 'ictce', 'version': '5.3.0'}
 
 sanity_check_paths = {
-                      'files': ['bin/stow'],
-                      'dirs': []
-                     }
+    'files': ['bin/stow'],
+    'dirs': []
+}
 
 moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/s/Stride/Stride-1.0-goolf-1.4.10.eb b/easybuild/easyconfigs/s/Stride/Stride-1.0-goolf-1.4.10.eb
index 5ab1176c2fe8126ebcd0bc82f9ba168beaf6a713..4982431a8cdbaaff46590ed25706e15f76ab5e85 100644
--- a/easybuild/easyconfigs/s/Stride/Stride-1.0-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/s/Stride/Stride-1.0-goolf-1.4.10.eb
@@ -12,7 +12,7 @@ description = "STRIDE is a program to recognize secondary structural elements in
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 
 source_urls = ['http://ftp.ebi.ac.uk/pub/software/unix/stride/src/']
-sources = ['%(namelower)s.tar.gz' ]
+sources = ['%(namelower)s.tar.gz']
 
 files_to_copy = [(['stride'], "bin")]
 
diff --git a/easybuild/easyconfigs/s/Stride/Stride-1.0-ictce-5.3.0.eb b/easybuild/easyconfigs/s/Stride/Stride-1.0-ictce-5.3.0.eb
index da61249bcff5dc1f16cb9156dc511092f8ccccb2..1a6fb2182d8aaefd07c24689227484d29ab4b7e2 100644
--- a/easybuild/easyconfigs/s/Stride/Stride-1.0-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/s/Stride/Stride-1.0-ictce-5.3.0.eb
@@ -12,7 +12,7 @@ description = "STRIDE is a program to recognize secondary structural elements in
 toolchain = {'name': 'ictce', 'version': '5.3.0'}
 
 source_urls = ['http://ftp.ebi.ac.uk/pub/software/unix/stride/src/']
-sources = ['%(namelower)s.tar.gz' ]
+sources = ['%(namelower)s.tar.gz']
 
 files_to_copy = [(['stride'], "bin")]
 
diff --git a/easybuild/easyconfigs/s/StringTie/StringTie-1.2.2-goolf-1.4.10.eb b/easybuild/easyconfigs/s/StringTie/StringTie-1.2.2-goolf-1.4.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..70ca06ed7656fef1ac059c6bb80d75d95ab0d2aa
--- /dev/null
+++ b/easybuild/easyconfigs/s/StringTie/StringTie-1.2.2-goolf-1.4.10.eb
@@ -0,0 +1,26 @@
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+# Author: Pablo Escobar Lopez
+# sciCORE - University of Basel
+# SIB Swiss Institute of Bioinformatics 
+
+easyblock = 'MakeCp'
+
+name = 'StringTie'
+version = '1.2.2'
+
+homepage = 'http://ccb.jhu.edu/software/stringtie/'
+description = """StringTie is a fast and highly efficient assembler of RNA-Seq alignments into potential transcripts."""
+
+toolchain = {'name': 'goolf', 'version': '1.4.10'}
+
+source_urls = ['http://ccb.jhu.edu/software/stringtie/dl/']
+sources = [SOURCELOWER_TAR_GZ]
+
+files_to_copy = [(['stringtie'], 'bin'), 'README', 'LICENSE']
+                
+sanity_check_paths = {
+    'files': ['bin/stringtie'],
+    'dirs': [],
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/s/Szip/Szip-2.1-foss-2015b.eb b/easybuild/easyconfigs/s/Szip/Szip-2.1-foss-2015b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..ecef46c63a533217e76ec119be73e755d7bd375c
--- /dev/null
+++ b/easybuild/easyconfigs/s/Szip/Szip-2.1-foss-2015b.eb
@@ -0,0 +1,23 @@
+easyblock = 'ConfigureMake'
+
+name = 'Szip'
+version = '2.1'
+
+homepage = 'http://www.hdfgroup.org/doc_resource/SZIP/'
+description = "Szip compression software, providing lossless compression of scientific data"
+
+toolchain = {'name': 'foss', 'version': '2015b'}
+toolchainopts = {'optarch': True, 'pic': True}
+
+source_urls = ['http://www.hdfgroup.org/ftp/lib-external/szip/%(version)s/src']
+sources = [SOURCELOWER_TAR_GZ]
+
+configopts = "--with-pic"
+
+sanity_check_paths = {
+    'files': ["lib/libsz.a", "lib/libsz.so"] +
+             ["include/%s" % x for x in ["ricehdf.h", "szip_adpt.h", "szlib.h"]],
+    'dirs': [],
+}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/s/Szip/Szip-2.1-intel-2016a.eb b/easybuild/easyconfigs/s/Szip/Szip-2.1-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..67b0f103595ff77e9f79b37cc7da6c6df4e832f5
--- /dev/null
+++ b/easybuild/easyconfigs/s/Szip/Szip-2.1-intel-2016a.eb
@@ -0,0 +1,23 @@
+easyblock = 'ConfigureMake'
+
+name = 'Szip'
+version = '2.1'
+
+homepage = 'http://www.hdfgroup.org/doc_resource/SZIP/'
+description = "Szip compression software, providing lossless compression of scientific data"
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+toolchainopts = {'optarch': True, 'pic': True}
+
+source_urls = ['http://www.hdfgroup.org/ftp/lib-external/szip/%(version)s/src']
+sources = [SOURCELOWER_TAR_GZ]
+
+configopts = "--with-pic"
+
+sanity_check_paths = {
+    'files': ["lib/libsz.a", "lib/libsz.%s" % SHLIB_EXT] +
+             ["include/%s" % x for x in ["ricehdf.h", "szip_adpt.h", "szlib.h"]],
+    'dirs': [],
+}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/s/scipy/scipy-0.17.0-intel-2016a-Python-2.7.11.eb b/easybuild/easyconfigs/s/scipy/scipy-0.17.0-intel-2016a-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..abaaff0546050dad678118cb795240b30e335ab6
--- /dev/null
+++ b/easybuild/easyconfigs/s/scipy/scipy-0.17.0-intel-2016a-Python-2.7.11.eb
@@ -0,0 +1,19 @@
+name = 'scipy'
+version = '0.17.0'
+versionsuffix = '-Python-2.7.11'
+
+homepage = 'http://www.scipy.org'
+description = """SciPy is a collection of mathematical algorithms and convenience
+ functions built on the Numpy extension for Python."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+toolchainopts = {'pic': True}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [
+    ('numpy', '1.10.4', versionsuffix),
+]
+
+moduleclass = 'math'
diff --git a/easybuild/easyconfigs/s/segemehl/segemehl-0.1.7-goolf-1.4.10.eb b/easybuild/easyconfigs/s/segemehl/segemehl-0.1.7-goolf-1.4.10.eb
index f5e2b9d7dd2acef1aa62d85fd27bd2fc1817db61..0c7b7b159e226748d5c4c0a5fc2ac850d48cf2c2 100644
--- a/easybuild/easyconfigs/s/segemehl/segemehl-0.1.7-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/s/segemehl/segemehl-0.1.7-goolf-1.4.10.eb
@@ -20,12 +20,12 @@ description = """ segemehl is a software to map short sequencer reads to referen
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 
 source_urls = ['http://www.bioinf.uni-leipzig.de/Software/segemehl/']
-sources = ['%s_%s.tar.gz' % (name, version.replace('.','_'))]
+sources = ['%s_%s.tar.gz' % (name, version.replace('.', '_'))]
 
 files_to_copy = [(["haarz.x", "lack.x", "segemehl.x"], "bin")]
 
 sanity_check_paths = {
-    'files': ["bin/%s" % x for x in ["haarz.x", "lack.x" , "segemehl.x"]],
+    'files': ["bin/%s" % x for x in ["haarz.x", "lack.x", "segemehl.x"]],
     'dirs': []
 }
 
diff --git a/easybuild/easyconfigs/s/setuptools/setuptools-0.6c11-goalf-1.1.0-no-OFED-Python-2.7.3.eb b/easybuild/easyconfigs/s/setuptools/setuptools-0.6c11-goalf-1.1.0-no-OFED-Python-2.7.3.eb
index 637462ec29ff5f2a63cdecc706337677342fd364..1283db629b99646be4efb80e304e2eb286f0aba9 100644
--- a/easybuild/easyconfigs/s/setuptools/setuptools-0.6c11-goalf-1.1.0-no-OFED-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/s/setuptools/setuptools-0.6c11-goalf-1.1.0-no-OFED-Python-2.7.3.eb
@@ -22,8 +22,8 @@ py_short_ver = ".".join(pythonversion.split(".")[0:2])
 pylibdir = "lib/python%s/site-packages/%s" % (py_short_ver, name)
 
 sanity_check_paths = {
-                      'files': ["bin/easy_install", "%s-%s-py%s.egg" % (pylibdir, version, py_short_ver)],
-                      'dirs': []
-                     }
+    'files': ["bin/easy_install", "%s-%s-py%s.egg" % (pylibdir, version, py_short_ver)],
+    'dirs': []
+}
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/s/setuptools/setuptools-0.6c11-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/s/setuptools/setuptools-0.6c11-goolf-1.4.10-Python-2.7.3.eb
index 517404e7700ec39ba6b9ef51f08d33f00768d730..a7165084656aa06c35ea9f15cab266530499e8ea 100644
--- a/easybuild/easyconfigs/s/setuptools/setuptools-0.6c11-goolf-1.4.10-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/s/setuptools/setuptools-0.6c11-goolf-1.4.10-Python-2.7.3.eb
@@ -22,8 +22,8 @@ py_short_ver = ".".join(pythonversion.split(".")[0:2])
 pylibdir = "lib/python%s/site-packages/%s" % (py_short_ver, name)
 
 sanity_check_paths = {
-                      'files': ["bin/easy_install", "%s-%s-py%s.egg" % (pylibdir, version, py_short_ver)],
-                      'dirs': []
-                     }
+    'files': ["bin/easy_install", "%s-%s-py%s.egg" % (pylibdir, version, py_short_ver)],
+    'dirs': []
+}
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/s/setuptools/setuptools-0.6c11-ictce-4.0.6-Python-2.7.3.eb b/easybuild/easyconfigs/s/setuptools/setuptools-0.6c11-ictce-4.0.6-Python-2.7.3.eb
index 62aa6e2bbcc7bdd1432818377a253e881197ea17..8ec68722c76df8b7792ecbee58a412370bda9a5b 100644
--- a/easybuild/easyconfigs/s/setuptools/setuptools-0.6c11-ictce-4.0.6-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/s/setuptools/setuptools-0.6c11-ictce-4.0.6-Python-2.7.3.eb
@@ -22,8 +22,8 @@ py_short_ver = ".".join(pythonversion.split(".")[0:2])
 pylibdir = "lib/python%s/site-packages/%s" % (py_short_ver, name)
 
 sanity_check_paths = {
-                      'files': ["bin/easy_install", "%s-%s-py%s.egg" % (pylibdir, version, py_short_ver)],
-                      'dirs': []
-                     }
+    'files': ["bin/easy_install", "%s-%s-py%s.egg" % (pylibdir, version, py_short_ver)],
+    'dirs': []
+}
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/s/setuptools/setuptools-0.6c11-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/s/setuptools/setuptools-0.6c11-ictce-5.3.0-Python-2.7.3.eb
index 82de605fe3249e36e71ce7db371b19c2ec0d74e2..cc07ddd7a2744b83895ccc2e660a8d009103d494 100644
--- a/easybuild/easyconfigs/s/setuptools/setuptools-0.6c11-ictce-5.3.0-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/s/setuptools/setuptools-0.6c11-ictce-5.3.0-Python-2.7.3.eb
@@ -22,8 +22,8 @@ py_short_ver = ".".join(pythonversion.split(".")[0:2])
 pylibdir = "lib/python%s/site-packages/%s" % (py_short_ver, name)
 
 sanity_check_paths = {
-                      'files': ["bin/easy_install", "%s-%s-py%s.egg" % (pylibdir, version, py_short_ver)],
-                      'dirs': []
-                     }
+    'files': ["bin/easy_install", "%s-%s-py%s.egg" % (pylibdir, version, py_short_ver)],
+    'dirs': []
+}
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/s/sparsehash/sparsehash-2.0.2-ictce-4.0.6.eb b/easybuild/easyconfigs/s/sparsehash/sparsehash-2.0.2-ictce-4.0.6.eb
index 0e8273491c3d1dad31c9d470bc62413566117627..97d974db7a59649226964d1b877ab8979eed2d33 100644
--- a/easybuild/easyconfigs/s/sparsehash/sparsehash-2.0.2-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/s/sparsehash/sparsehash-2.0.2-ictce-4.0.6.eb
@@ -13,7 +13,7 @@ toolchainopts = {'optarch': True}
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = ['http://sparsehash.googlecode.com/files']
 
-#runtest = "check"  # 1/7 tests fails (hashtable_test), so disabling 'make check' for now
+# runtest = "check"  # 1/7 tests fails (hashtable_test), so disabling 'make check' for now
 
 sanity_check_paths = {
     'files': ['include/sparsehash/%s' % x for x in ['dense_hash_map', 'dense_hash_set', 'sparse_hash_map',
diff --git a/easybuild/easyconfigs/s/sparsehash/sparsehash-2.0.2-ictce-5.3.0.eb b/easybuild/easyconfigs/s/sparsehash/sparsehash-2.0.2-ictce-5.3.0.eb
index ef04dcc09e4920bffff31faebc94a97964f80eb3..dc0162d6b6dbdfdb99c29a4d04c59a61f397fc67 100644
--- a/easybuild/easyconfigs/s/sparsehash/sparsehash-2.0.2-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/s/sparsehash/sparsehash-2.0.2-ictce-5.3.0.eb
@@ -13,7 +13,7 @@ toolchainopts = {'optarch': True}
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = ['http://sparsehash.googlecode.com/files']
 
-#runtest = "check"  # 1/7 tests fails (hashtable_test), so disabling 'make check' for now
+# runtest = "check"  # 1/7 tests fails (hashtable_test), so disabling 'make check' for now
 
 sanity_check_paths = {
     'files': ['include/sparsehash/%s' % x for x in ['dense_hash_map', 'dense_hash_set', 'sparse_hash_map',
diff --git a/easybuild/easyconfigs/s/synchronicity/synchronicity-1.1.9.1-foss-2015b-R-3.2.3.eb b/easybuild/easyconfigs/s/synchronicity/synchronicity-1.1.9.1-foss-2015b-R-3.2.3.eb
new file mode 100644
index 0000000000000000000000000000000000000000..f056af2b4f5cdf4d06bbcf67b640b3e02f6a919a
--- /dev/null
+++ b/easybuild/easyconfigs/s/synchronicity/synchronicity-1.1.9.1-foss-2015b-R-3.2.3.eb
@@ -0,0 +1,36 @@
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Author: Adam Huffman <adam.huffman@crick.ac.uk>
+# The Francis Crick Institute
+
+easyblock = 'RPackage'
+
+name = 'synchronicity'
+version = '1.1.9.1'
+
+homepage = 'http://cran.r-project.org/web/packages/%(name)s'
+description = """synchronicity: Boost mutex functionality in R"""
+
+toolchain = {'name': 'foss', 'version': '2015b'}
+
+source_urls = [
+    'http://cran.r-project.org/src/contrib/',
+    'http://cran.r-project.org/src/contrib/Archive/$(name)s/',
+]
+sources = ['%(name)s_%(version)s.tar.gz']
+
+r = 'R'
+rver = '3.2.3'
+versionsuffix = '-%s-%s' % (r, rver)
+
+dependencies = [
+    (r, rver),
+    ('BH', '1.60.0-1', '-R-3.2.3'),
+]
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['synchronicity'],
+}
+
+moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/t/TCC/TCC-0.9.26.eb b/easybuild/easyconfigs/t/TCC/TCC-0.9.26.eb
index 9fc79c204d56d5dc29706383f1ae82c53d1eeb16..c502d5385e3f361b41852ef622e04b093d66ee70 100644
--- a/easybuild/easyconfigs/t/TCC/TCC-0.9.26.eb
+++ b/easybuild/easyconfigs/t/TCC/TCC-0.9.26.eb
@@ -11,7 +11,6 @@ easyblock = 'ConfigureMake'
 
 name = 'TCC'
 version = '0.9.26'
-# altversions = ['0.9.21', '0.9.22', '0.9.23', '0.9.24', '0.9.25', '0.9.26'] # older versions may require more special handling
 
 homepage = 'http://bellard.org/tcc/'
 description = """The Tiny C Compiler (aka TCC, tCc, or TinyCC) is an x86 and x86-64 C compiler
diff --git a/easybuild/easyconfigs/t/Tcl/Tcl-8.6.2-ictce-5.5.0.eb b/easybuild/easyconfigs/t/Tcl/Tcl-8.6.2-ictce-5.5.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..8c3980c54e6b0d6005f8788f29286f2141b2b975
--- /dev/null
+++ b/easybuild/easyconfigs/t/Tcl/Tcl-8.6.2-ictce-5.5.0.eb
@@ -0,0 +1,25 @@
+easyblock = 'ConfigureMake'
+
+name = 'Tcl'
+version = '8.6.2'
+
+homepage = 'http://www.tcl.tk/'
+description = """Tcl (Tool Command Language) is a very powerful but easy to learn dynamic programming language,
+suitable for a very wide range of uses, including web and desktop applications, networking, administration, testing and many more."""
+
+toolchain = {'name': 'ictce', 'version': '5.5.0'}
+
+source_urls = ["http://prdownloads.sourceforge.net/tcl"]
+sources = ['%(namelower)s%(version)s-src.tar.gz']
+
+dependencies = [
+    ('zlib', '1.2.7'),
+]
+
+configopts = '--enable-threads EXTRA_INSTALL="install-private-headers"'
+
+runtest = 'test'
+
+start_dir = 'unix'
+
+moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/t/TiCCutils/TiCCutils-0.3-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/t/TiCCutils/TiCCutils-0.3-goalf-1.1.0-no-OFED.eb
index f64c40563e10e7f305d135f4713a2eec78bc68ff..0a31dc00cbd47034cc553b045f59a7ff194afeeb 100644
--- a/easybuild/easyconfigs/t/TiCCutils/TiCCutils-0.3-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/t/TiCCutils/TiCCutils-0.3-goalf-1.1.0-no-OFED.eb
@@ -3,7 +3,7 @@ easyblock = 'ConfigureMake'
 name = 'TiCCutils'
 version = '0.3'
 
-homepage = 'http://software.ticc.uvt.nl/' # no real homepage found
+homepage = 'http://software.ticc.uvt.nl/'  # no real homepage found
 description = """TiCC utils is a collection of generic C++ software which is used in a lot of programs produced at
  Tilburg centre for Cognition and Communication (TiCC) at Tilburg University and
  Centre for Dutch Language and Speech at University of Antwerp."""
diff --git a/easybuild/easyconfigs/t/TiCCutils/TiCCutils-0.3-goolf-1.4.10.eb b/easybuild/easyconfigs/t/TiCCutils/TiCCutils-0.3-goolf-1.4.10.eb
index 445f99bec6bd2959226564df532a5d79f4a14cb4..1a4e06f1c9ae19051365d5ee517097fa260a3dfb 100644
--- a/easybuild/easyconfigs/t/TiCCutils/TiCCutils-0.3-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/t/TiCCutils/TiCCutils-0.3-goolf-1.4.10.eb
@@ -3,7 +3,7 @@ easyblock = 'ConfigureMake'
 name = 'TiCCutils'
 version = '0.3'
 
-homepage = 'http://software.ticc.uvt.nl/' # no real homepage found
+homepage = 'http://software.ticc.uvt.nl/'  # no real homepage found
 description = """TiCC utils is a collection of generic C++ software which is used in a lot of programs produced at
  Tilburg centre for Cognition and Communication (TiCC) at Tilburg University and
  Centre for Dutch Language and Speech at University of Antwerp."""
diff --git a/easybuild/easyconfigs/t/TiCCutils/TiCCutils-0.3-ictce-4.1.13.eb b/easybuild/easyconfigs/t/TiCCutils/TiCCutils-0.3-ictce-4.1.13.eb
index 70bc5a288d51f040fedba337e3791a4d8f2e03cc..c735eaf2227ff619e632d5629900e2ab65947bf5 100644
--- a/easybuild/easyconfigs/t/TiCCutils/TiCCutils-0.3-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/t/TiCCutils/TiCCutils-0.3-ictce-4.1.13.eb
@@ -3,7 +3,7 @@ easyblock = 'ConfigureMake'
 name = 'TiCCutils'
 version = '0.3'
 
-homepage = 'http://software.ticc.uvt.nl/' # no real homepage found
+homepage = 'http://software.ticc.uvt.nl/'  # no real homepage found
 description = """TiCC utils is a collection of generic C++ software which is used in a lot of programs produced at
  Tilburg centre for Cognition and Communication (TiCC) at Tilburg University and
  Centre for Dutch Language and Speech at University of Antwerp."""
diff --git a/easybuild/easyconfigs/t/TiCCutils/TiCCutils-0.3-ictce-5.3.0.eb b/easybuild/easyconfigs/t/TiCCutils/TiCCutils-0.3-ictce-5.3.0.eb
index a5a1f3ba0c0c5e4ae30b50692836b32bf39916da..0dcf061046a226b84473412687ae98e277a5f283 100644
--- a/easybuild/easyconfigs/t/TiCCutils/TiCCutils-0.3-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/t/TiCCutils/TiCCutils-0.3-ictce-5.3.0.eb
@@ -3,7 +3,7 @@ easyblock = 'ConfigureMake'
 name = 'TiCCutils'
 version = '0.3'
 
-homepage = 'http://software.ticc.uvt.nl/' # no real homepage found
+homepage = 'http://software.ticc.uvt.nl/'  # no real homepage found
 description = """TiCC utils is a collection of generic C++ software which is used in a lot of programs produced at
  Tilburg centre for Cognition and Communication (TiCC) at Tilburg University and
  Centre for Dutch Language and Speech at University of Antwerp."""
diff --git a/easybuild/easyconfigs/t/TiCCutils/TiCCutils-0.7-intel-2015b.eb b/easybuild/easyconfigs/t/TiCCutils/TiCCutils-0.7-intel-2015b.eb
index d62879bb69f5bc8cd35ca90278a27ce09b12a9a8..563e538143db95cd461c80550f2a9e16a6eb2d00 100644
--- a/easybuild/easyconfigs/t/TiCCutils/TiCCutils-0.7-intel-2015b.eb
+++ b/easybuild/easyconfigs/t/TiCCutils/TiCCutils-0.7-intel-2015b.eb
@@ -3,7 +3,7 @@ easyblock = 'ConfigureMake'
 name = 'TiCCutils'
 version = '0.7'
 
-homepage = 'http://software.ticc.uvt.nl/' # no real homepage found
+homepage = 'http://software.ticc.uvt.nl/'  # no real homepage found
 description = """TiCC utils is a collection of generic C++ software which is used in a lot of programs produced at
  Tilburg centre for Cognition and Communication (TiCC) at Tilburg University and
  Centre for Dutch Language and Speech at University of Antwerp."""
diff --git a/easybuild/easyconfigs/t/TiMBL/TiMBL-6.4.3-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/t/TiMBL/TiMBL-6.4.3-goalf-1.1.0-no-OFED.eb
index efab9018605526646029710903117f3da778cf68..8f1566ed45aac73b5d1e1b6fb4d1860102f5eebc 100644
--- a/easybuild/easyconfigs/t/TiMBL/TiMBL-6.4.3-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/t/TiMBL/TiMBL-6.4.3-goalf-1.1.0-no-OFED.eb
@@ -18,7 +18,7 @@ sources = [SOURCELOWER_TAR_GZ]
 source_urls = ['http://software.ticc.uvt.nl/']
 
 dependencies = [
-    ('TiCCutils' , '0.3'),
+    ('TiCCutils', '0.3'),
     ('libxml2', '2.9.0'),
 ]
 
diff --git a/easybuild/easyconfigs/t/TiMBL/TiMBL-6.4.3-goolf-1.4.10.eb b/easybuild/easyconfigs/t/TiMBL/TiMBL-6.4.3-goolf-1.4.10.eb
index 9db7b9cd717a1933cc58c1e80b2fd1ec556c4a39..4c496b94e6b1a8e81a1f250a41721c02764623b5 100644
--- a/easybuild/easyconfigs/t/TiMBL/TiMBL-6.4.3-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/t/TiMBL/TiMBL-6.4.3-goolf-1.4.10.eb
@@ -18,7 +18,7 @@ sources = [SOURCELOWER_TAR_GZ]
 source_urls = ['http://software.ticc.uvt.nl/']
 
 dependencies = [
-    ('TiCCutils' , '0.3'),
+    ('TiCCutils', '0.3'),
     ('libxml2', '2.9.0'),
 ]
 
diff --git a/easybuild/easyconfigs/t/TiMBL/TiMBL-6.4.3-ictce-4.1.13.eb b/easybuild/easyconfigs/t/TiMBL/TiMBL-6.4.3-ictce-4.1.13.eb
index ef78059fdfe292112ce74848b0da8e723b0d0f7c..85caf0607378c5ec17537d2fa6cff31eab46ac3c 100644
--- a/easybuild/easyconfigs/t/TiMBL/TiMBL-6.4.3-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/t/TiMBL/TiMBL-6.4.3-ictce-4.1.13.eb
@@ -18,7 +18,7 @@ sources = [SOURCELOWER_TAR_GZ]
 source_urls = ['http://software.ticc.uvt.nl/']
 
 dependencies = [
-    ('TiCCutils' , '0.3'),
+    ('TiCCutils', '0.3'),
     ('libxml2', '2.9.0'),
 ]
 
diff --git a/easybuild/easyconfigs/t/TiMBL/TiMBL-6.4.3-ictce-5.3.0.eb b/easybuild/easyconfigs/t/TiMBL/TiMBL-6.4.3-ictce-5.3.0.eb
index 72a8eb72c874b574643bb6d5f1d983da614552c2..4a0a138713ebbf2115842407680296a32668e389 100644
--- a/easybuild/easyconfigs/t/TiMBL/TiMBL-6.4.3-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/t/TiMBL/TiMBL-6.4.3-ictce-5.3.0.eb
@@ -18,7 +18,7 @@ sources = [SOURCELOWER_TAR_GZ]
 source_urls = ['http://software.ticc.uvt.nl/']
 
 dependencies = [
-    ('TiCCutils' , '0.3'),
+    ('TiCCutils', '0.3'),
     ('libxml2', '2.9.0'),
 ]
 
diff --git a/easybuild/easyconfigs/t/TiMBL/TiMBL-6.4.6-intel-2015b.eb b/easybuild/easyconfigs/t/TiMBL/TiMBL-6.4.6-intel-2015b.eb
index 9f427601238c8ba243acd2ebafeecfd3b8188bbe..d47e571a9088036878a31a6fe7be80b670efb9b8 100644
--- a/easybuild/easyconfigs/t/TiMBL/TiMBL-6.4.6-intel-2015b.eb
+++ b/easybuild/easyconfigs/t/TiMBL/TiMBL-6.4.6-intel-2015b.eb
@@ -18,7 +18,7 @@ sources = [SOURCELOWER_TAR_GZ]
 source_urls = ['http://software.ticc.uvt.nl/']
 
 dependencies = [
-    ('TiCCutils' , '0.7'),
+    ('TiCCutils', '0.7'),
     ('libxml2', '2.9.2'),
 ]
 
diff --git a/easybuild/easyconfigs/t/TinySVM/TinySVM-0.09-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/t/TinySVM/TinySVM-0.09-goalf-1.1.0-no-OFED.eb
index 456eed6b562cdd254d82829888c8811a05110927..1a655e2f3634c459f7a8621282314eb250f560d2 100644
--- a/easybuild/easyconfigs/t/TinySVM/TinySVM-0.09-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/t/TinySVM/TinySVM-0.09-goalf-1.1.0-no-OFED.eb
@@ -15,7 +15,7 @@ toolchainopts = {'optarch': True, 'pic': True, 'opt': True, 'unroll': True}
 sources = [SOURCE_TAR_GZ]
 source_urls = ['http://chasen.org/~taku/software/TinySVM/src']
 
-#original CXXFLAGS: -Wall -O9 -funroll-all-loops -finline -ffast-math
+# original CXXFLAGS: -Wall -O9 -funroll-all-loops -finline -ffast-math
 buildopts = 'CXXFLAGS="$CXXFLAGS -Wall -funroll-all-loops -finline -ffast-math"'
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/t/TinySVM/TinySVM-0.09-goolf-1.4.10.eb b/easybuild/easyconfigs/t/TinySVM/TinySVM-0.09-goolf-1.4.10.eb
index 3b1c60d1100caa76ecadc789b999ff911d7379c3..2a3ee4cd04dae201b61ac836090228a7443127a1 100644
--- a/easybuild/easyconfigs/t/TinySVM/TinySVM-0.09-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/t/TinySVM/TinySVM-0.09-goolf-1.4.10.eb
@@ -15,7 +15,7 @@ toolchainopts = {'optarch': True, 'pic': True, 'opt': True, 'unroll': True}
 sources = [SOURCE_TAR_GZ]
 source_urls = ['http://chasen.org/~taku/software/TinySVM/src']
 
-#original CXXFLAGS: -Wall -O9 -funroll-all-loops -finline -ffast-math
+# original CXXFLAGS: -Wall -O9 -funroll-all-loops -finline -ffast-math
 buildopts = 'CXXFLAGS="$CXXFLAGS -Wall -funroll-all-loops -finline -ffast-math"'
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/t/TinySVM/TinySVM-0.09-ictce-4.1.13.eb b/easybuild/easyconfigs/t/TinySVM/TinySVM-0.09-ictce-4.1.13.eb
index 7676e956fa983db23184fc44aca426fa56e8bd92..4191830cf2984cb648f028d95c6379b0bfd1234f 100644
--- a/easybuild/easyconfigs/t/TinySVM/TinySVM-0.09-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/t/TinySVM/TinySVM-0.09-ictce-4.1.13.eb
@@ -15,7 +15,7 @@ toolchainopts = {'optarch': True, 'pic': True, 'opt': True, 'unroll': True}
 sources = [SOURCE_TAR_GZ]
 source_urls = ['http://chasen.org/~taku/software/TinySVM/src']
 
-#original CXXFLAGS: -Wall -O9 -funroll-all-loops -finline -ffast-math
+# original CXXFLAGS: -Wall -O9 -funroll-all-loops -finline -ffast-math
 buildopts = 'CXXFLAGS="$CXXFLAGS -Wall -funroll-all-loops -finline"'
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/t/TinySVM/TinySVM-0.09-ictce-5.3.0.eb b/easybuild/easyconfigs/t/TinySVM/TinySVM-0.09-ictce-5.3.0.eb
index 7c112ec10504829091c1161da50ede5eb304d709..3eb47571e167fea741c2e2f7fda4409230a532cd 100644
--- a/easybuild/easyconfigs/t/TinySVM/TinySVM-0.09-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/t/TinySVM/TinySVM-0.09-ictce-5.3.0.eb
@@ -15,7 +15,7 @@ toolchainopts = {'optarch': True, 'pic': True, 'opt': True, 'unroll': True}
 sources = [SOURCE_TAR_GZ]
 source_urls = ['http://chasen.org/~taku/software/TinySVM/src']
 
-#original CXXFLAGS: -Wall -O9 -funroll-all-loops -finline -ffast-math
+# original CXXFLAGS: -Wall -O9 -funroll-all-loops -finline -ffast-math
 buildopts = 'CXXFLAGS="$CXXFLAGS -Wall -funroll-all-loops -finline"'
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/t/Tornado/Tornado-2012.09.06-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/t/Tornado/Tornado-2012.09.06-goalf-1.1.0-no-OFED.eb
index 3ad1ac0bbd7b62bcb8b0ef92181d03eb553b07d3..7e0e189b7c0c2cfe018f50b8d59a0bc1e3b1baa6 100644
--- a/easybuild/easyconfigs/t/Tornado/Tornado-2012.09.06-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/t/Tornado/Tornado-2012.09.06-goalf-1.1.0-no-OFED.eb
@@ -4,7 +4,7 @@ version = '2012.09.06'
 homepage = 'http://www.dhigroup.com/'
 description = """Tornado is a new kernel for modelling and virtual experimentation (i.e. any evaluation of a model)
  in the domain of water quality management"""
- 
+
 toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
 toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
 
diff --git a/easybuild/easyconfigs/t/Trilinos/Trilinos-10.12.2-goalf-1.1.0-no-OFED-Python-2.7.3.eb b/easybuild/easyconfigs/t/Trilinos/Trilinos-10.12.2-goalf-1.1.0-no-OFED-Python-2.7.3.eb
index b287384487f3601ca124cee40819d7e3904e0a6e..4db1cfdda126cdb0637833a38109e1b192304184 100644
--- a/easybuild/easyconfigs/t/Trilinos/Trilinos-10.12.2-goalf-1.1.0-no-OFED-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/t/Trilinos/Trilinos-10.12.2-goalf-1.1.0-no-OFED-Python-2.7.3.eb
@@ -18,11 +18,11 @@ patches = ['fix-parmetis.patch']
 # order matters!
 # ParMETIS needs to go after SCOTCH (because of incldue dirs)
 dependencies = [
-                ('Boost', '1.49.0', versionsuffix ),
-                ('SCOTCH', '5.1.12b_esmumps'),
-                ('SuiteSparse', '3.7.0', '-withparmetis'),
-                ('ParMETIS', '4.0.2')
-               ]
+    ('Boost', '1.49.0', versionsuffix),
+    ('SCOTCH', '5.1.12b_esmumps'),
+    ('SuiteSparse', '3.7.0', '-withparmetis'),
+    ('ParMETIS', '4.0.2')
+]
 
 builddependencies = [('CMake', '2.8.4')]
 
diff --git a/easybuild/easyconfigs/t/Trilinos/Trilinos-10.12.2-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/t/Trilinos/Trilinos-10.12.2-goolf-1.4.10-Python-2.7.3.eb
index 1ec0f27b136afa1db7106a269abd85bc672798cf..ec1d8d6521db768c8960132536aab580befc8363 100644
--- a/easybuild/easyconfigs/t/Trilinos/Trilinos-10.12.2-goolf-1.4.10-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/t/Trilinos/Trilinos-10.12.2-goolf-1.4.10-Python-2.7.3.eb
@@ -14,18 +14,18 @@ source_urls = ['http://trilinos.sandia.gov/download/files/']
 sources = ['%s-%s-Source.tar.gz' % (name.lower(), version)]
 
 patches = [
-           'fix-parmetis.patch',
-           'Trilinos_GCC-4.7.patch',
-          ]
+    'fix-parmetis.patch',
+    'Trilinos_GCC-4.7.patch',
+]
 
 # order matters!
 # ParMETIS needs to go after SCOTCH (because of incldue dirs)
 dependencies = [
-                ('Boost', '1.49.0', versionsuffix ),
-                ('SCOTCH', '5.1.12b_esmumps'),
-                ('SuiteSparse', '3.7.0', '-withparmetis'),
-                ('ParMETIS', '4.0.2')
-               ]
+    ('Boost', '1.49.0', versionsuffix),
+    ('SCOTCH', '5.1.12b_esmumps'),
+    ('SuiteSparse', '3.7.0', '-withparmetis'),
+    ('ParMETIS', '4.0.2')
+]
 
 builddependencies = [('CMake', '2.8.4')]
 
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 fea45f6e5c39d91f959e79af23dc52a595c301f7..b9ba5e4b73224083eccea73b29c63f873b3b43c7 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
@@ -18,11 +18,11 @@ patches = ['fix-parmetis.patch']
 # order matters!
 # ParMETIS needs to go after SCOTCH (because of incldue dirs)
 dependencies = [
-                ('Boost', '1.49.0', versionsuffix ),
-                ('SCOTCH', '5.1.12b_esmumps'),
-                ('SuiteSparse', '3.7.0', '-withparmetis'),
-                ('ParMETIS', '4.0.2')
-               ]
+    ('Boost', '1.49.0', versionsuffix),
+    ('SCOTCH', '5.1.12b_esmumps'),
+    ('SuiteSparse', '3.7.0', '-withparmetis'),
+    ('ParMETIS', '4.0.2')
+]
 
 builddependencies = [('CMake', '2.8.4')]
 
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 84613e0ab25b7f46dd68ab95e74a877e20109799..4ee95fa9094e8fa640d5886f48cdecc5d0e6abb9 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
@@ -19,11 +19,11 @@ patches = ['fix-parmetis.patch']
 # order matters!
 # ParMETIS needs to go after SCOTCH (because of incldue dirs)
 dependencies = [
-                ('Boost', '1.49.0', versionsuffix ),
-                ('SCOTCH', '5.1.12b_esmumps'),
-                ('SuiteSparse', '3.7.0', '-withparmetis'),
-                ('ParMETIS', '4.0.2')
-               ]
+    ('Boost', '1.49.0', versionsuffix),
+    ('SCOTCH', '5.1.12b_esmumps'),
+    ('SuiteSparse', '3.7.0', '-withparmetis'),
+    ('ParMETIS', '4.0.2')
+]
 
 builddependencies = [('CMake', '2.8.4')]
 
diff --git a/easybuild/easyconfigs/t/Trim_Galore/Trim_Galore-0.3.7-goolf-1.4.10.eb b/easybuild/easyconfigs/t/Trim_Galore/Trim_Galore-0.3.7-goolf-1.4.10.eb
index 53e79949f3235b70465eed1f46917e833f84c6d1..5b029bff07cf235a3baf9a5cafe4b254a52932f5 100644
--- a/easybuild/easyconfigs/t/Trim_Galore/Trim_Galore-0.3.7-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/t/Trim_Galore/Trim_Galore-0.3.7-goolf-1.4.10.eb
@@ -16,8 +16,8 @@ source_urls = ['http://www.bioinformatics.babraham.ac.uk/projects/%(namelower)s'
 install_cmd = "cp -a %(namelower)s_zip/* %(installdir)s && chmod +x %(installdir)s/%(namelower)s"
 
 dependencies = [
-     ('FastQC', '0.10.1'),
-     ('cutadapt', '1.5', '-Python-2.7.10'),
+    ('FastQC', '0.10.1'),
+    ('cutadapt', '1.5', '-Python-2.7.10'),
 ]
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/t/Trinity/Trinity-2.0.4-goolf-1.4.10.eb b/easybuild/easyconfigs/t/Trinity/Trinity-2.0.4-goolf-1.4.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..1f448f04b91840bdb1ad1eecfb5232ea0f4ebe55
--- /dev/null
+++ b/easybuild/easyconfigs/t/Trinity/Trinity-2.0.4-goolf-1.4.10.eb
@@ -0,0 +1,28 @@
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+# Author: Pablo Escobar Lopez
+# Swiss Institute of Bioinformatics
+# Biozentrum - University of Basel
+
+name = 'Trinity'
+version = '2.0.4'
+
+homepage = 'http://trinityrnaseq.github.io/'
+description = """Trinity represents a novel method for the efficient and robust de novo reconstruction
+ of transcriptomes from RNA-Seq data. Trinity combines three independent software modules: Inchworm,
+ Chrysalis, and Butterfly, applied sequentially to process large volumes of RNA-Seq reads."""
+
+toolchain = {'name': 'goolf', 'version': '1.4.10'}
+
+source_urls = ['https://github.com/trinityrnaseq/trinityrnaseq/archive/']
+sources = ['v%(version)s.tar.gz']
+
+patches = ['Trinity-%(version)s_plugins-Makefile.patch']
+
+dependencies = [
+    ('Java', '1.7.0_80', '', True),
+    ('ant', '1.9.6', '-Java-%(javaver)s', True),
+    ('ncurses', '5.9'),
+    ('zlib', '1.2.8'),
+]
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/t/Trinity/Trinity-2.0.4_plugins-Makefile.patch b/easybuild/easyconfigs/t/Trinity/Trinity-2.0.4_plugins-Makefile.patch
new file mode 100644
index 0000000000000000000000000000000000000000..0fa19b8876fac6eb72112a2563226465986fa589
--- /dev/null
+++ b/easybuild/easyconfigs/t/Trinity/Trinity-2.0.4_plugins-Makefile.patch
@@ -0,0 +1,24 @@
+fix linking against EB-provided zlib
+author: Kenneth Hoste (Ghent University)
+--- trinityrnaseq-2.0.4/trinity-plugins/Makefile.orig	2015-02-14 20:34:09.000000000 +0100
++++ trinityrnaseq-2.0.4/trinity-plugins/Makefile	2016-02-16 11:21:03.430691000 +0100
+@@ -13,6 +13,9 @@
+ endif
+ 
+ 
++CC?=gcc
++CXX?=g++
++
+ #######################
+ ### Required by Trinity
+ #######################
+@@ -52,7 +55,8 @@
+ 
+ rsem:
+ 	tar -zxvf ${RSEM_CODE}.tar.gz
+-	cd ${RSEM_CODE} && $(MAKE) LIBCURSES="${RSEM_LIBCURSES}"
++	sed -i -e 's@-lz@-L${EBROOTZLIB}/lib -lz@g' ${RSEM_CODE}/Makefile
++	cd ${RSEM_CODE} && $(MAKE) LIBCURSES="${RSEM_LIBCURSES}" LIBPATH="-L${EBROOTNCURSES}/lib -L${EBROOTZLIB}/lib"
+ 	ln -sf ${RSEM_CODE} rsem
+ 
+ transdecoder_target:
diff --git a/easybuild/easyconfigs/t/Trinity/Trinity-2.0.6-goolf-1.4.10.eb b/easybuild/easyconfigs/t/Trinity/Trinity-2.0.6-goolf-1.4.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..30e64b353f604b806efe2b751dad742dd0f658f8
--- /dev/null
+++ b/easybuild/easyconfigs/t/Trinity/Trinity-2.0.6-goolf-1.4.10.eb
@@ -0,0 +1,28 @@
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+# Author: Pablo Escobar Lopez
+# Swiss Institute of Bioinformatics
+# Biozentrum - University of Basel
+
+name = 'Trinity'
+version = '2.0.6'
+
+homepage = 'http://trinityrnaseq.github.io/'
+description = """Trinity represents a novel method for the efficient and robust de novo reconstruction
+ of transcriptomes from RNA-Seq data. Trinity combines three independent software modules: Inchworm,
+ Chrysalis, and Butterfly, applied sequentially to process large volumes of RNA-Seq reads."""
+
+toolchain = {'name': 'goolf', 'version': '1.4.10'}
+
+source_urls = ['https://github.com/trinityrnaseq/trinityrnaseq/archive/']
+sources = ['v%(version)s.tar.gz']
+
+patches = ['Trinity-2.0.4_plugins-Makefile.patch']
+
+dependencies = [
+    ('Java', '1.7.0_80', '', True),
+    ('ant', '1.9.6', '-Java-%(javaver)s', True),
+    ('ncurses', '5.9'),
+    ('zlib', '1.2.8'),
+]
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/t/Trinity/Trinity-2012-10-05-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/t/Trinity/Trinity-2012-10-05-goalf-1.1.0-no-OFED.eb
index 24e51d7fbb93d83c1d6bcd10419461e693ae2c19..c40d2edf578b89df7f05966199627da6c5d1af3b 100644
--- a/easybuild/easyconfigs/t/Trinity/Trinity-2012-10-05-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/t/Trinity/Trinity-2012-10-05-goalf-1.1.0-no-OFED.eb
@@ -13,21 +13,21 @@ source_urls = [('http://sourceforge.net/projects/trinityrnaseq/files', 'download
 sources = ['trinityrnaseq_r%s.tgz' % version]
 
 patches = [
-           'chrysalis_commandline_noconsts_2012-10-05.patch',
-           'cmd_forker_taskset_2012-10-05.patch',
-           'trinitypl_increase_max_cpu_2012-10-05.patch',
-           'rsem-plugin_makefile-cxx.patch',
-          ]
+    'chrysalis_commandline_noconsts_2012-10-05.patch',
+    'cmd_forker_taskset_2012-10-05.patch',
+    'trinitypl_increase_max_cpu_2012-10-05.patch',
+    'rsem-plugin_makefile-cxx.patch',
+]
 
 java = 'Java'
 javaver = '1.7.0_10'
 
 dependencies = [
-                (java, javaver, '', True),
-                ('ant', '1.8.4', '-%s-%s' % (java, javaver), True),
-                ('ncurses', '5.9'),
-                ('zlib', '1.2.7'),
-               ]
+    (java, javaver, '', True),
+    ('ant', '1.8.4', '-%s-%s' % (java, javaver), True),
+    ('ncurses', '5.9'),
+    ('zlib', '1.2.7'),
+]
 
 bwapluginver = "0.5.7"
 RSEMmod = True
diff --git a/easybuild/easyconfigs/t/Trinity/Trinity-2012-10-05-goolf-1.4.10.eb b/easybuild/easyconfigs/t/Trinity/Trinity-2012-10-05-goolf-1.4.10.eb
index 3a3bdebbaa9ea76c64aafbd509ed163b042254e3..e966db8b0a5d5c323daec5a9d338a62d7b24ba65 100644
--- a/easybuild/easyconfigs/t/Trinity/Trinity-2012-10-05-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/t/Trinity/Trinity-2012-10-05-goolf-1.4.10.eb
@@ -13,22 +13,22 @@ source_urls = [('http://sourceforge.net/projects/trinityrnaseq/files', 'download
 sources = ['trinityrnaseq_r%s.tgz' % version]
 
 patches = [
-           'chrysalis_commandline_noconsts_2012-10-05.patch',
-           'cmd_forker_taskset_2012-10-05.patch',
-           'trinitypl_increase_max_cpu_2012-10-05.patch',
-           'rsem-plugin_makefile-cxx.patch',
-           'trinity_jellyfish-GCC-4.7.patch',
-          ]
+    'chrysalis_commandline_noconsts_2012-10-05.patch',
+    'cmd_forker_taskset_2012-10-05.patch',
+    'trinitypl_increase_max_cpu_2012-10-05.patch',
+    'rsem-plugin_makefile-cxx.patch',
+    'trinity_jellyfish-GCC-4.7.patch',
+]
 
 java = 'Java'
 javaver = '1.7.0_10'
 
 dependencies = [
-                (java, javaver, '', True),
-                ('ant', '1.8.4', '-%s-%s' % (java, javaver), True),
-                ('ncurses', '5.9'),
-                ('zlib', '1.2.7'),
-               ]
+    (java, javaver, '', True),
+    ('ant', '1.8.4', '-%s-%s' % (java, javaver), True),
+    ('ncurses', '5.9'),
+    ('zlib', '1.2.7'),
+]
 
 bwapluginver = "0.5.7"
 RSEMmod = True
diff --git a/easybuild/easyconfigs/t/Trinity/Trinity-2012-10-05-ictce-3.2.2.u3.eb b/easybuild/easyconfigs/t/Trinity/Trinity-2012-10-05-ictce-3.2.2.u3.eb
index d7180a3903b8211f52f4e4bbb34eb524e9307a9f..62366fe15cb2467684291e669dc03f1bc4ef682b 100644
--- a/easybuild/easyconfigs/t/Trinity/Trinity-2012-10-05-ictce-3.2.2.u3.eb
+++ b/easybuild/easyconfigs/t/Trinity/Trinity-2012-10-05-ictce-3.2.2.u3.eb
@@ -13,22 +13,22 @@ source_urls = [('http://sourceforge.net/projects/trinityrnaseq/files', 'download
 sources = ['trinityrnaseq_r%s.tgz' % version]
 
 patches = [
-           'chrysalis_commandline_noconsts_2012-10-05.patch',
-           'cmd_forker_taskset_2012-10-05.patch',
-           'trinitypl_increase_max_cpu_2012-10-05.patch',
-           'rsem-plugin_makefile-cxx.patch',
-           'trinity_ictce-no-jellyfish.patch',
-          ]
+    'chrysalis_commandline_noconsts_2012-10-05.patch',
+    'cmd_forker_taskset_2012-10-05.patch',
+    'trinitypl_increase_max_cpu_2012-10-05.patch',
+    'rsem-plugin_makefile-cxx.patch',
+    'trinity_ictce-no-jellyfish.patch',
+]
 
 java = 'Java'
 javaver = '1.7.0_10'
 
 dependencies = [
-                (java, javaver, '', True),
-                ('ant', '1.8.4', '-%s-%s' % (java, javaver), True),
-                ('ncurses', '5.9'),
-                ('zlib', '1.2.7'),
-               ]
+    (java, javaver, '', True),
+    ('ant', '1.8.4', '-%s-%s' % (java, javaver), True),
+    ('ncurses', '5.9'),
+    ('zlib', '1.2.7'),
+]
 
 bwapluginver = "0.5.7"
 RSEMmod = True
diff --git a/easybuild/easyconfigs/t/Trinity/Trinity-2012-10-05-ictce-5.3.0.eb b/easybuild/easyconfigs/t/Trinity/Trinity-2012-10-05-ictce-5.3.0.eb
index 76aac8d3344ed18a14fbb1d7d9c680a4d33f3ded..7f5d5792225c23d98f6900579d56f0844fc26819 100644
--- a/easybuild/easyconfigs/t/Trinity/Trinity-2012-10-05-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/t/Trinity/Trinity-2012-10-05-ictce-5.3.0.eb
@@ -14,22 +14,22 @@ source_urls = [('http://sourceforge.net/projects/trinityrnaseq/files', 'download
 sources = ['trinityrnaseq_r%s.tgz' % version]
 
 patches = [
-           'chrysalis_commandline_noconsts_2012-10-05.patch',
-           'cmd_forker_taskset_2012-10-05.patch',
-           'trinitypl_increase_max_cpu_2012-10-05.patch',
-           'rsem-plugin_makefile-cxx.patch',
-           'trinity_ictce-no-jellyfish.patch',
-          ]
+    'chrysalis_commandline_noconsts_2012-10-05.patch',
+    'cmd_forker_taskset_2012-10-05.patch',
+    'trinitypl_increase_max_cpu_2012-10-05.patch',
+    'rsem-plugin_makefile-cxx.patch',
+    'trinity_ictce-no-jellyfish.patch',
+]
 
 java = 'Java'
 javaver = '1.7.0_10'
 
 dependencies = [
-                (java, javaver, '', True),
-                ('ant', '1.8.4', '-%s-%s' % (java, javaver), True),
-                ('ncurses', '5.9'),
-                ('zlib', '1.2.7'),
-               ]
+    (java, javaver, '', True),
+    ('ant', '1.8.4', '-%s-%s' % (java, javaver), True),
+    ('ncurses', '5.9'),
+    ('zlib', '1.2.7'),
+]
 
 bwapluginver = "0.5.7"
 RSEMmod = True
diff --git a/easybuild/easyconfigs/t/tclcl/tclcl-1.20-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/t/tclcl/tclcl-1.20-goalf-1.1.0-no-OFED.eb
index ae48804dd31275684916efdfdeb93d32863402f7..59880307584f81d00246d1a8dc2c74a5c92da758 100644
--- a/easybuild/easyconfigs/t/tclcl/tclcl-1.20-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/t/tclcl/tclcl-1.20-goalf-1.1.0-no-OFED.eb
@@ -18,7 +18,7 @@ source_urls = ['http://prdownloads.sourceforge.net/otcl-tclcl']
 
 tcl_ver = '8.5.12'
 dependencies = [
-    ('Tcl',tcl_ver),
+    ('Tcl', tcl_ver),
     ('Tk', tcl_ver),
     ('otcl', '1.14'),
 ]
diff --git a/easybuild/easyconfigs/t/tclcl/tclcl-1.20-goolf-1.4.10.eb b/easybuild/easyconfigs/t/tclcl/tclcl-1.20-goolf-1.4.10.eb
index 76b89b4e3d47e232136a7df4787ff8798c9ba5b1..0fa1db9859b2b7b15474f14e32149e7e1b12d11a 100644
--- a/easybuild/easyconfigs/t/tclcl/tclcl-1.20-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/t/tclcl/tclcl-1.20-goolf-1.4.10.eb
@@ -18,7 +18,7 @@ source_urls = ['http://prdownloads.sourceforge.net/otcl-tclcl']
 
 tcl_ver = '8.5.12'
 dependencies = [
-    ('Tcl',tcl_ver),
+    ('Tcl', tcl_ver),
     ('Tk', tcl_ver),
     ('otcl', '1.14'),
 ]
diff --git a/easybuild/easyconfigs/t/tclcl/tclcl-1.20-ictce-5.3.0.eb b/easybuild/easyconfigs/t/tclcl/tclcl-1.20-ictce-5.3.0.eb
index 70183e7b6fbce3042e5a64645e7aae6b1df63e23..7009190de26307d6bc455139c22fdcee772df7e3 100644
--- a/easybuild/easyconfigs/t/tclcl/tclcl-1.20-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/t/tclcl/tclcl-1.20-ictce-5.3.0.eb
@@ -18,7 +18,7 @@ source_urls = ['http://prdownloads.sourceforge.net/otcl-tclcl']
 
 tcl_ver = '8.5.12'
 dependencies = [
-    ('Tcl',tcl_ver),
+    ('Tcl', tcl_ver),
     ('Tk', tcl_ver),
     ('otcl', '1.14'),
 ]
diff --git a/easybuild/easyconfigs/t/testpath/testpath-0.3-intel-2016a-Python-2.7.11.eb b/easybuild/easyconfigs/t/testpath/testpath-0.3-intel-2016a-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..ea6de39dd21e83c86e056be0a92af182792a476d
--- /dev/null
+++ b/easybuild/easyconfigs/t/testpath/testpath-0.3-intel-2016a-Python-2.7.11.eb
@@ -0,0 +1,30 @@
+easyblock = 'PythonPackage'
+
+name = 'testpath'
+version = '0.3'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'https://github.com/jupyter/testpath'
+description = """Test utilities for code working with files and commands"""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+source_urls = ['https://pypi.python.org/packages/py2.py3/t/testpath/']
+sources = ['testpath-%(version)s-py2.py3-none-any.whl']
+
+dependencies = [
+    ('Python', '2.7.11'),
+]
+builddependencies = [
+    ('pip', '8.0.2', versionsuffix),
+]
+
+use_pip = True
+unpack_sources = False
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%(pyshortver)s/site-packages/testpath'],
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/t/texinfo/texinfo-4.13a.eb b/easybuild/easyconfigs/t/texinfo/texinfo-4.13a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..1f3105220a9c5a73edd2dc9e5a13aa68b188a8b7
--- /dev/null
+++ b/easybuild/easyconfigs/t/texinfo/texinfo-4.13a.eb
@@ -0,0 +1,31 @@
+easyblock = 'ConfigureMake'
+
+name = 'texinfo'
+version = '4.13a'
+
+homepage = 'https://www.gnu.org/software/texinfo/'
+description = """Texinfo is the official documentation format of the GNU project."""
+
+source_urls = [GNU_SOURCE]
+sources = [SOURCELOWER_TAR_GZ]
+
+toolchain = {'name': 'dummy', 'version': ''}
+
+osdependencies = ['texlive']
+
+preinstallopts = "make TEXMF=%(installdir)s/texmf install-tex && "
+
+# This will overwrite a users $TEXMFHOME so this module is best used as a build dependency
+modextravars = {'TEXMFHOME': '%(installdir)s/texmf'}
+modloadmsg = "\n\nWARNING: This texinfo module has (re)defined the value for the environment variable \\$TEXMFHOME.\n"
+modloadmsg += "If you use a custom texmf directory (such as ~/texmf) you should copy files found in the\n"
+modloadmsg += "new \\$TEXMFHOME to your custom directory and reset the value of \\$TEXMFHOME to point to that space:\n"
+modloadmsg += "\tcp -r $TEXMFHOME/* /path/to/your/texmf\n"
+modloadmsg += "\texport TEXMFHOME=/path/to/your/texmf\n\n"
+
+sanity_check_paths = {
+    'files': ['bin/info', 'bin/makeinfo', 'bin/texi2pdf', 'texmf/tex/texinfo/texinfo.tex'],
+    'dirs': [],
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/t/texinfo/texinfo-5.2-GCC-4.8.2.eb b/easybuild/easyconfigs/t/texinfo/texinfo-5.2-GCC-4.8.2.eb
index 7e2b9ee6aa1f505f71fa4453fb7d28f1788796c5..e8a270b38c02749e6baf9a09f86291dd844ea7b7 100644
--- a/easybuild/easyconfigs/t/texinfo/texinfo-5.2-GCC-4.8.2.eb
+++ b/easybuild/easyconfigs/t/texinfo/texinfo-5.2-GCC-4.8.2.eb
@@ -17,11 +17,11 @@ preinstallopts = "make TEXMF=%(installdir)s/texmf install-tex && "
 
 # This will overwrite a users $TEXMFHOME so this module is best used as a build dependency
 modextravars = {'TEXMFHOME': '%(installdir)s/texmf'}
-modloadmsg    = "\n\nWARNING: This texinfo module has (re)defined the value for the environment variable \\$TEXMFHOME.\n"
-modloadmsg    += "If you use a custom texmf directory (such as ~/texmf) you should copy files found in the\n"
-modloadmsg    += "new \\$TEXMFHOME to your custom directory and reset the value of \\$TEXMFHOME to point to that space:\n"
-modloadmsg    += "\tcp -r $TEXMFHOME/* /path/to/your/texmf\n"
-modloadmsg    += "\texport TEXMFHOME=/path/to/your/texmf\n\n"
+modloadmsg = "\n\nWARNING: This texinfo module has (re)defined the value for the environment variable \\$TEXMFHOME.\n"
+modloadmsg += "If you use a custom texmf directory (such as ~/texmf) you should copy files found in the\n"
+modloadmsg += "new \\$TEXMFHOME to your custom directory and reset the value of \\$TEXMFHOME to point to that space:\n"
+modloadmsg += "\tcp -r $TEXMFHOME/* /path/to/your/texmf\n"
+modloadmsg += "\texport TEXMFHOME=/path/to/your/texmf\n\n"
 
 sanity_check_paths = {
     'files': ['bin/info', 'bin/makeinfo', 'bin/pod2texi', 'bin/texi2pdf', 'texmf/tex/texinfo/texinfo.tex'],
diff --git a/easybuild/easyconfigs/u/UFC/UFC-2.0.5-goalf-1.1.0-no-OFED-Python-2.7.3.eb b/easybuild/easyconfigs/u/UFC/UFC-2.0.5-goalf-1.1.0-no-OFED-Python-2.7.3.eb
index d5b510117725a5a47ca6d6ca002729cb7cfda9eb..764f2be10bfd26c67373cdd9cb3ee853ae83d336 100644
--- a/easybuild/easyconfigs/u/UFC/UFC-2.0.5-goalf-1.1.0-no-OFED-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/u/UFC/UFC-2.0.5-goalf-1.1.0-no-OFED-Python-2.7.3.eb
@@ -17,11 +17,11 @@ pythonversion = '2.7.3'
 versionsuffix = "-%s-%s" % (python, pythonversion)
 
 dependencies = [
-                (python, pythonversion),
-                ('Boost', '1.49.0', versionsuffix),
-                ('Instant', '1.0.0', versionsuffix),
-                ('SWIG', '2.0.4', versionsuffix),
-               ]
+    (python, pythonversion),
+    ('Boost', '1.49.0', versionsuffix),
+    ('Instant', '1.0.0', versionsuffix),
+    ('SWIG', '2.0.4', versionsuffix),
+]
 
 builddependencies = [('CMake', '2.8.4')]
 
diff --git a/easybuild/easyconfigs/u/UFC/UFC-2.0.5-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/u/UFC/UFC-2.0.5-goolf-1.4.10-Python-2.7.3.eb
index 10b9d9e61d56708a07e2ea466abe162a2afea1ec..47c5ff4491a1c14063ea6868561b80e59b44cf71 100644
--- a/easybuild/easyconfigs/u/UFC/UFC-2.0.5-goolf-1.4.10-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/u/UFC/UFC-2.0.5-goolf-1.4.10-Python-2.7.3.eb
@@ -17,11 +17,11 @@ pythonversion = '2.7.3'
 versionsuffix = "-%s-%s" % (python, pythonversion)
 
 dependencies = [
-                (python, pythonversion),
-                ('Boost', '1.49.0', versionsuffix),
-                ('Instant', '1.0.0', versionsuffix),
-                ('SWIG', '2.0.4', versionsuffix),
-               ]
+    (python, pythonversion),
+    ('Boost', '1.49.0', versionsuffix),
+    ('Instant', '1.0.0', versionsuffix),
+    ('SWIG', '2.0.4', versionsuffix),
+]
 
 builddependencies = [('CMake', '2.8.4')]
 
diff --git a/easybuild/easyconfigs/u/UFC/UFC-2.0.5-ictce-4.0.6-Python-2.7.3.eb b/easybuild/easyconfigs/u/UFC/UFC-2.0.5-ictce-4.0.6-Python-2.7.3.eb
index ea960b2f02ef57e1876b8d04980d4fd1e6fab2c4..0a5f724b73d72ea53d6d2d44954588866f9c6b4b 100644
--- a/easybuild/easyconfigs/u/UFC/UFC-2.0.5-ictce-4.0.6-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/u/UFC/UFC-2.0.5-ictce-4.0.6-Python-2.7.3.eb
@@ -17,11 +17,11 @@ pythonversion = '2.7.3'
 versionsuffix = "-%s-%s" % (python, pythonversion)
 
 dependencies = [
-                (python, pythonversion),
-                ('Boost', '1.49.0', versionsuffix),
-                ('Instant', '1.0.0', versionsuffix),
-                ('SWIG', '2.0.4', versionsuffix),
-               ]
+    (python, pythonversion),
+    ('Boost', '1.49.0', versionsuffix),
+    ('Instant', '1.0.0', versionsuffix),
+    ('SWIG', '2.0.4', versionsuffix),
+]
 
 builddependencies = [('CMake', '2.8.4')]
 
diff --git a/easybuild/easyconfigs/u/UFC/UFC-2.0.5-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/u/UFC/UFC-2.0.5-ictce-5.3.0-Python-2.7.3.eb
index 2be9be92daec46b562e40ea0f7314ae91303a977..4998756c2ea139ef87e1f0d1c65e636cc0206f31 100644
--- a/easybuild/easyconfigs/u/UFC/UFC-2.0.5-ictce-5.3.0-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/u/UFC/UFC-2.0.5-ictce-5.3.0-Python-2.7.3.eb
@@ -18,11 +18,11 @@ pythonversion = '2.7.3'
 versionsuffix = "-%s-%s" % (python, pythonversion)
 
 dependencies = [
-                (python, pythonversion),
-                ('Boost', '1.49.0', versionsuffix),
-                ('Instant', '1.0.0', versionsuffix),
-                ('SWIG', '2.0.4', versionsuffix),
-               ]
+    (python, pythonversion),
+    ('Boost', '1.49.0', versionsuffix),
+    ('Instant', '1.0.0', versionsuffix),
+    ('SWIG', '2.0.4', versionsuffix),
+]
 
 builddependencies = [('CMake', '2.8.4')]
 
diff --git a/easybuild/easyconfigs/u/UFL/UFL-1.0.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb b/easybuild/easyconfigs/u/UFL/UFL-1.0.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb
index 9bd8667afb16fa4e8840ca6d97d75dded95c7d46..806978a0449136660171debca89fc9499990e772 100644
--- a/easybuild/easyconfigs/u/UFL/UFL-1.0.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/u/UFL/UFL-1.0.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb
@@ -23,8 +23,8 @@ versionsuffix = "-%s-%s" % (python, pythonversion)
 dependencies = [(python, pythonversion)]
 
 sanity_check_paths = {
-                      'files': ['bin/%s' % x for x in ["form2ufl", "ufl2py", "ufl-analyse", "ufl-convert", "ufl-version"]],
-                      'dirs': ['lib/python%s/site-packages/ufl' % pythonshortversion]
-                     }
+    'files': ['bin/%s' % x for x in ["form2ufl", "ufl2py", "ufl-analyse", "ufl-convert", "ufl-version"]],
+    'dirs': ['lib/python%s/site-packages/ufl' % pythonshortversion]
+}
 
 moduleclass = 'cae'
diff --git a/easybuild/easyconfigs/u/UFL/UFL-1.0.0-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/u/UFL/UFL-1.0.0-goolf-1.4.10-Python-2.7.3.eb
index 4177e70f06d0a11f6c36520f90b16acc8099954b..44bbfb4a0628f7bb69af1e4643049c047ca68e4c 100644
--- a/easybuild/easyconfigs/u/UFL/UFL-1.0.0-goolf-1.4.10-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/u/UFL/UFL-1.0.0-goolf-1.4.10-Python-2.7.3.eb
@@ -23,8 +23,8 @@ versionsuffix = "-%s-%s" % (python, pythonversion)
 dependencies = [(python, pythonversion)]
 
 sanity_check_paths = {
-                      'files': ['bin/%s' % x for x in ["form2ufl", "ufl2py", "ufl-analyse", "ufl-convert", "ufl-version"]],
-                      'dirs': ['lib/python%s/site-packages/ufl' % pythonshortversion]
-                     }
+    'files': ['bin/%s' % x for x in ["form2ufl", "ufl2py", "ufl-analyse", "ufl-convert", "ufl-version"]],
+    'dirs': ['lib/python%s/site-packages/ufl' % pythonshortversion]
+}
 
 moduleclass = 'cae'
diff --git a/easybuild/easyconfigs/u/UFL/UFL-1.0.0-ictce-4.0.6-Python-2.7.3.eb b/easybuild/easyconfigs/u/UFL/UFL-1.0.0-ictce-4.0.6-Python-2.7.3.eb
index 55688fcbe69462ff2d8e2fc0fdba3c48c9e3f59a..0d8f8edb49e4fea37084d36aa51ac989b6b322a5 100644
--- a/easybuild/easyconfigs/u/UFL/UFL-1.0.0-ictce-4.0.6-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/u/UFL/UFL-1.0.0-ictce-4.0.6-Python-2.7.3.eb
@@ -23,8 +23,8 @@ versionsuffix = "-%s-%s" % (python, pythonversion)
 dependencies = [(python, pythonversion)]
 
 sanity_check_paths = {
-                      'files': ['bin/%s' % x for x in ["form2ufl", "ufl2py", "ufl-analyse", "ufl-convert", "ufl-version"]],
-                      'dirs': ['lib/python%s/site-packages/ufl' % pythonshortversion]
-                     }
+    'files': ['bin/%s' % x for x in ["form2ufl", "ufl2py", "ufl-analyse", "ufl-convert", "ufl-version"]],
+    'dirs': ['lib/python%s/site-packages/ufl' % pythonshortversion]
+}
 
 moduleclass = 'cae'
diff --git a/easybuild/easyconfigs/u/UFL/UFL-1.0.0-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/u/UFL/UFL-1.0.0-ictce-5.3.0-Python-2.7.3.eb
index fcb84880d336b0d6da6d066c17a58ee99376e6e8..30a212235a062a7378a7d4a0bac5d575b6cdc233 100644
--- a/easybuild/easyconfigs/u/UFL/UFL-1.0.0-ictce-5.3.0-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/u/UFL/UFL-1.0.0-ictce-5.3.0-Python-2.7.3.eb
@@ -24,8 +24,8 @@ versionsuffix = "-%s-%s" % (python, pythonversion)
 dependencies = [(python, pythonversion)]
 
 sanity_check_paths = {
-                      'files': ['bin/%s' % x for x in ["form2ufl", "ufl2py", "ufl-analyse", "ufl-convert", "ufl-version"]],
-                      'dirs': ['lib/python%s/site-packages/ufl' % pythonshortversion]
-                     }
+    'files': ['bin/%s' % x for x in ["form2ufl", "ufl2py", "ufl-analyse", "ufl-convert", "ufl-version"]],
+    'dirs': ['lib/python%s/site-packages/ufl' % pythonshortversion]
+}
 
 moduleclass = 'cae'
diff --git a/easybuild/easyconfigs/u/USEARCH/USEARCH-5.2.236-i86linux32.eb b/easybuild/easyconfigs/u/USEARCH/USEARCH-5.2.236-i86linux32.eb
new file mode 100644
index 0000000000000000000000000000000000000000..961153d9b47f8f658584e76fa77486b4f3d865f3
--- /dev/null
+++ b/easybuild/easyconfigs/u/USEARCH/USEARCH-5.2.236-i86linux32.eb
@@ -0,0 +1,29 @@
+easyblock = 'Binary'
+
+name = 'USEARCH'
+version = '5.2.236'
+versionsuffix = '-i86linux32'
+
+homepage = 'http://www.drive5.com/usearch/index.html'
+description = """USEARCH is a unique sequence analysis tool which offers search and clustering algorithms that are
+ often orders of magnitude faster than BLAST."""
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+# download via http://www.drive5.com/usearch/download.html
+usearch_bin = 'usearch%s_%s' % (version, versionsuffix[1:])
+sources = [usearch_bin]
+
+install_cmd = "mkdir -p %%(installdir)s/bin && mv %s %%(installdir)s/bin/%%(namelower)s && " % usearch_bin
+install_cmd += "chmod a+rx %(installdir)s/bin/%(namelower)s"
+
+modloadmsg = """USEARCH (32-bit) is licensed software but
+ can be used for free by individuals when registered. A 64-bit version is
+ also available. For more information see http://www.drive5.com/usearch ."""
+
+sanity_check_paths = {
+    'files': ['bin/%(namelower)s'],
+    'dirs': [],
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/u/USEARCH/USEARCH-6.1.544-i86linux32.eb b/easybuild/easyconfigs/u/USEARCH/USEARCH-6.1.544-i86linux32.eb
new file mode 100644
index 0000000000000000000000000000000000000000..07e180dab52d731d0fcd579764c90d78627106fb
--- /dev/null
+++ b/easybuild/easyconfigs/u/USEARCH/USEARCH-6.1.544-i86linux32.eb
@@ -0,0 +1,29 @@
+easyblock = 'Binary'
+
+name = 'USEARCH'
+version = '6.1.544'
+versionsuffix = '-i86linux32'
+
+homepage = 'http://www.drive5.com/usearch/index.html'
+description = """USEARCH is a unique sequence analysis tool which offers search and clustering algorithms that are
+ often orders of magnitude faster than BLAST."""
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+# download via http://www.drive5.com/usearch/download.html
+usearch_bin = 'usearch%s_%s' % (version, versionsuffix[1:])
+sources = [usearch_bin]
+
+install_cmd = "mkdir -p %%(installdir)s/bin && mv %s %%(installdir)s/bin/%%(namelower)s && " % usearch_bin
+install_cmd += "chmod a+rx %(installdir)s/bin/%(namelower)s"
+
+modloadmsg = """USEARCH (32-bit) is licensed software but
+ can be used for free by individuals when registered. A 64-bit version is
+ also available. For more information see http://www.drive5.com/usearch ."""
+
+sanity_check_paths = {
+    'files': ['bin/%(namelower)s'],
+    'dirs': [],
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/u/util-linux/util-linux-2.22.2-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/u/util-linux/util-linux-2.22.2-goalf-1.1.0-no-OFED.eb
index 5c2f9f5f7c656fdc5edbdff371c4dfeda1dda0f4..5e621327c3c2909b1cb03fd38aaf152a5492eb38 100644
--- a/easybuild/easyconfigs/u/util-linux/util-linux-2.22.2-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/u/util-linux/util-linux-2.22.2-goalf-1.1.0-no-OFED.eb
@@ -22,7 +22,7 @@ configopts += "--with-systemdsystemunitdir='${prefix}/systemd' "
 dependencies = [('ncurses', '5.9')]
 
 sanity_check_paths = {
-    'files': ['lib/lib%s.a' % x for x in ['blkid' , 'mount', 'uuid']],
+    'files': ['lib/lib%s.a' % x for x in ['blkid', 'mount', 'uuid']],
     'dirs': ['include', 'bin', 'share', 'sbin'],
 }
 
diff --git a/easybuild/easyconfigs/u/util-linux/util-linux-2.22.2-goolf-1.4.10.eb b/easybuild/easyconfigs/u/util-linux/util-linux-2.22.2-goolf-1.4.10.eb
index 80fbeb975f9b71233bf26150c7504d97215a57e0..75238f212442b437b5ba539363666f1017118271 100644
--- a/easybuild/easyconfigs/u/util-linux/util-linux-2.22.2-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/u/util-linux/util-linux-2.22.2-goolf-1.4.10.eb
@@ -22,7 +22,7 @@ configopts += "--with-systemdsystemunitdir='${prefix}/systemd' "
 dependencies = [('ncurses', '5.9')]
 
 sanity_check_paths = {
-    'files': ['lib/lib%s.a' % x for x in ['blkid' , 'mount', 'uuid']],
+    'files': ['lib/lib%s.a' % x for x in ['blkid', 'mount', 'uuid']],
     'dirs': ['include', 'bin', 'share', 'sbin'],
 }
 
diff --git a/easybuild/easyconfigs/u/util-linux/util-linux-2.22.2-ictce-4.1.13.eb b/easybuild/easyconfigs/u/util-linux/util-linux-2.22.2-ictce-4.1.13.eb
index f9d273f24a3c4abe473c32a8ef575b9ef49f6e45..dadb7261d1d2a2a7dcb9df61927bcb1b49e500a1 100644
--- a/easybuild/easyconfigs/u/util-linux/util-linux-2.22.2-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/u/util-linux/util-linux-2.22.2-ictce-4.1.13.eb
@@ -22,7 +22,7 @@ configopts += "--with-systemdsystemunitdir='${prefix}/systemd' "
 dependencies = [('ncurses', '5.9')]
 
 sanity_check_paths = {
-    'files': ['lib/lib%s.a' % x for x in ['blkid' , 'mount', 'uuid']],
+    'files': ['lib/lib%s.a' % x for x in ['blkid', 'mount', 'uuid']],
     'dirs': ['include', 'bin', 'share', 'sbin'],
 }
 
diff --git a/easybuild/easyconfigs/u/util-linux/util-linux-2.22.2-ictce-5.3.0.eb b/easybuild/easyconfigs/u/util-linux/util-linux-2.22.2-ictce-5.3.0.eb
index aa973159c71f0e28e037c21704c614ff2b90ed8e..ed49a78c1e658773b6985c97c7e0f58f57a0bdc4 100644
--- a/easybuild/easyconfigs/u/util-linux/util-linux-2.22.2-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/u/util-linux/util-linux-2.22.2-ictce-5.3.0.eb
@@ -22,7 +22,7 @@ configopts += "--with-systemdsystemunitdir='${prefix}/systemd' "
 dependencies = [('ncurses', '5.9')]
 
 sanity_check_paths = {
-    'files': ['lib/lib%s.a' % x for x in ['blkid' , 'mount', 'uuid']],
+    'files': ['lib/lib%s.a' % x for x in ['blkid', 'mount', 'uuid']],
     'dirs': ['include', 'bin', 'share', 'sbin'],
 }
 
diff --git a/easybuild/easyconfigs/u/util-linux/util-linux-2.22.2-ictce-5.5.0.eb b/easybuild/easyconfigs/u/util-linux/util-linux-2.22.2-ictce-5.5.0.eb
index a3c15983570e392ef35ae30f35cfa60983df38ed..43d67f412c11c7b27de94702dc9aec70e88a2b9b 100644
--- a/easybuild/easyconfigs/u/util-linux/util-linux-2.22.2-ictce-5.5.0.eb
+++ b/easybuild/easyconfigs/u/util-linux/util-linux-2.22.2-ictce-5.5.0.eb
@@ -22,7 +22,7 @@ configopts += "--with-systemdsystemunitdir='${prefix}/systemd' "
 dependencies = [('ncurses', '5.9')]
 
 sanity_check_paths = {
-    'files': ['lib/lib%s.a' % x for x in ['blkid' , 'mount', 'uuid']],
+    'files': ['lib/lib%s.a' % x for x in ['blkid', 'mount', 'uuid']],
     'dirs': ['include', 'bin', 'share', 'sbin'],
 }
 
diff --git a/easybuild/easyconfigs/u/util-linux/util-linux-2.22.2-intel-2014b.eb b/easybuild/easyconfigs/u/util-linux/util-linux-2.22.2-intel-2014b.eb
index bfe2f53f72891ccad4016a663bdc2f75debaf2d2..df0a957cf2c2e0f394d16d086b2f018c6f080154 100644
--- a/easybuild/easyconfigs/u/util-linux/util-linux-2.22.2-intel-2014b.eb
+++ b/easybuild/easyconfigs/u/util-linux/util-linux-2.22.2-intel-2014b.eb
@@ -8,7 +8,7 @@ description = """Set of Linux utilities"""
 
 toolchain = {'name': 'intel', 'version': '2014b'}
 
-source_urls = ['%s/v%s'%(homepage,'.'.join(version.split('.')[0:2]) )]
+source_urls = ['%s/v%s' % (homepage, '.'.join(version.split('.')[0:2]))]
 sources = [SOURCELOWER_TAR_GZ]
 
 # disable account related utilities (they need OS dependant pam-devel files)
@@ -22,7 +22,7 @@ configopts += "--with-systemdsystemunitdir='${prefix}/systemd' "
 dependencies = [('ncurses', '5.9')]
 
 sanity_check_paths = {
-    'files': ['lib/lib%s.a' % x for x in ['blkid' , 'mount', 'uuid']],
+    'files': ['lib/lib%s.a' % x for x in ['blkid', 'mount', 'uuid']],
     'dirs': ['include', 'bin', 'share', 'sbin'],
 }
 
diff --git a/easybuild/easyconfigs/u/util-linux/util-linux-2.24-ictce-5.5.0.eb b/easybuild/easyconfigs/u/util-linux/util-linux-2.24-ictce-5.5.0.eb
index c583476f42fb58eeaff36dedf1e9621617fc64fb..be21e2d15b3851761c784c062ebe518c57d45aa4 100644
--- a/easybuild/easyconfigs/u/util-linux/util-linux-2.24-ictce-5.5.0.eb
+++ b/easybuild/easyconfigs/u/util-linux/util-linux-2.24-ictce-5.5.0.eb
@@ -22,7 +22,7 @@ configopts += "--with-systemdsystemunitdir='${prefix}/systemd' "
 dependencies = [('ncurses', '5.9')]
 
 sanity_check_paths = {
-    'files': ['lib/lib%s.a' % x for x in ['blkid' , 'mount', 'uuid']],
+    'files': ['lib/lib%s.a' % x for x in ['blkid', 'mount', 'uuid']],
     'dirs': ['include', 'bin', 'share', 'sbin'],
 }
 
diff --git a/easybuild/easyconfigs/u/util-linux/util-linux-2.24.1-ictce-5.5.0.eb b/easybuild/easyconfigs/u/util-linux/util-linux-2.24.1-ictce-5.5.0.eb
index ba35f12734a8637ed28e06e028e5db90bdbdba69..f71360b39b222539cb84c4460133c356f4dd16a2 100644
--- a/easybuild/easyconfigs/u/util-linux/util-linux-2.24.1-ictce-5.5.0.eb
+++ b/easybuild/easyconfigs/u/util-linux/util-linux-2.24.1-ictce-5.5.0.eb
@@ -24,7 +24,7 @@ configopts += "--with-bashcompletiondir='${prefix}/share/bash-completion/complet
 dependencies = [('ncurses', '5.9')]
 
 sanity_check_paths = {
-    'files': ['lib/lib%s.a' % x for x in ['blkid' , 'mount', 'uuid']],
+    'files': ['lib/lib%s.a' % x for x in ['blkid', 'mount', 'uuid']],
     'dirs': ['include', 'bin', 'share', 'sbin'],
 }
 
diff --git a/easybuild/easyconfigs/u/util-linux/util-linux-2.26.1-foss-2015a.eb b/easybuild/easyconfigs/u/util-linux/util-linux-2.26.1-foss-2015a.eb
index dc874b1a62fe2986c85058a879b4b7232dfc0a43..61d17ba4f2069161356f782f2ae88f898eee4884 100644
--- a/easybuild/easyconfigs/u/util-linux/util-linux-2.26.1-foss-2015a.eb
+++ b/easybuild/easyconfigs/u/util-linux/util-linux-2.26.1-foss-2015a.eb
@@ -26,7 +26,7 @@ configopts += "--without-python "
 dependencies = [('ncurses', '5.9')]
 
 sanity_check_paths = {
-    'files': ['lib/lib%s.a' % x for x in ['blkid' , 'mount', 'uuid']],
+    'files': ['lib/lib%s.a' % x for x in ['blkid', 'mount', 'uuid']],
     'dirs': ['include', 'bin', 'share', 'sbin'],
 }
 
diff --git a/easybuild/easyconfigs/u/util-linux/util-linux-2.26.1-intel-2015a.eb b/easybuild/easyconfigs/u/util-linux/util-linux-2.26.1-intel-2015a.eb
index b64073541184414e3a5d71d248f640e9866c3860..c339492021d626a75a588991b2bf8e882885fae1 100644
--- a/easybuild/easyconfigs/u/util-linux/util-linux-2.26.1-intel-2015a.eb
+++ b/easybuild/easyconfigs/u/util-linux/util-linux-2.26.1-intel-2015a.eb
@@ -26,7 +26,7 @@ configopts += "--without-python "
 dependencies = [('ncurses', '5.9')]
 
 sanity_check_paths = {
-    'files': ['lib/lib%s.a' % x for x in ['blkid' , 'mount', 'uuid']],
+    'files': ['lib/lib%s.a' % x for x in ['blkid', 'mount', 'uuid']],
     'dirs': ['include', 'bin', 'share', 'sbin'],
 }
 
diff --git a/easybuild/easyconfigs/u/util-linux/util-linux-2.26.2-intel-2015a.eb b/easybuild/easyconfigs/u/util-linux/util-linux-2.26.2-intel-2015a.eb
index 0d1eb341d5bdce6e4d7cdd8acbc3aa9d1191c604..dae5a4f2971e6771e37e620a881929b47cd40fe7 100644
--- a/easybuild/easyconfigs/u/util-linux/util-linux-2.26.2-intel-2015a.eb
+++ b/easybuild/easyconfigs/u/util-linux/util-linux-2.26.2-intel-2015a.eb
@@ -26,7 +26,7 @@ configopts += "--without-python "
 dependencies = [('ncurses', '5.9')]
 
 sanity_check_paths = {
-    'files': ['lib/lib%s.a' % x for x in ['blkid' , 'mount', 'uuid']],
+    'files': ['lib/lib%s.a' % x for x in ['blkid', 'mount', 'uuid']],
     'dirs': ['include', 'bin', 'share', 'sbin'],
 }
 
diff --git a/easybuild/easyconfigs/u/util-linux/util-linux-2.27.1-foss-2015a.eb b/easybuild/easyconfigs/u/util-linux/util-linux-2.27.1-foss-2015a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..50b1fff058cd9d175a989fe187f55c6edc64ac39
--- /dev/null
+++ b/easybuild/easyconfigs/u/util-linux/util-linux-2.27.1-foss-2015a.eb
@@ -0,0 +1,33 @@
+easyblock = 'ConfigureMake'
+
+name = 'util-linux'
+version = '2.27.1'
+
+homepage = 'http://www.kernel.org/pub/linux/utils/util-linux'
+description = """Set of Linux utilities"""
+
+toolchain = {'name': 'foss', 'version': '2015a'}
+
+source_urls = ['%s/v%%(version_major_minor)s' % homepage]
+sources = [SOURCELOWER_TAR_GZ]
+
+# disable account related utilities (they need OS dependant pam-devel files)
+# disable wall and friends (requires group changing permissions for install user)
+# install systemd service files in install dir
+# install bash completion files in install dir
+configopts = "--disable-chfn-chsh --disable-login --disable-su "
+configopts += "--disable-wall --disable-use-tty-group "
+configopts += "--disable-makeinstall-chown --disable-makeinstall-setuid "
+configopts += "--with-systemdsystemunitdir='${prefix}/systemd' "
+configopts += "--with-bashcompletiondir='${prefix}/share/bash-completion/completions' "
+# disable building Python bindings (since we don't include Python as a dep)
+configopts += "--without-python "
+
+dependencies = [('ncurses', '5.9')]
+
+sanity_check_paths = {
+    'files': ['lib/lib%s.a' % x for x in ['blkid', 'mount', 'uuid']],
+    'dirs': ['include', 'bin', 'share', 'sbin'],
+}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/u/util-linux/util-linux-2.27.1-intel-2015b.eb b/easybuild/easyconfigs/u/util-linux/util-linux-2.27.1-intel-2015b.eb
index 43293be3b6fa22a46f502b39a31be8e22811a1c0..98645a6d82885a8164a793ee1f3f0442ed9f6f8b 100644
--- a/easybuild/easyconfigs/u/util-linux/util-linux-2.27.1-intel-2015b.eb
+++ b/easybuild/easyconfigs/u/util-linux/util-linux-2.27.1-intel-2015b.eb
@@ -26,7 +26,7 @@ configopts += "--without-python "
 dependencies = [('ncurses', '5.9')]
 
 sanity_check_paths = {
-    'files': ['lib/lib%s.a' % x for x in ['blkid' , 'mount', 'uuid']],
+    'files': ['lib/lib%s.a' % x for x in ['blkid', 'mount', 'uuid']],
     'dirs': ['include', 'bin', 'share', 'sbin'],
 }
 
diff --git a/easybuild/easyconfigs/v/VCFtools/VCFtools-0.1.14-foss-2015b-Perl-5.20.3.eb b/easybuild/easyconfigs/v/VCFtools/VCFtools-0.1.14-foss-2015b-Perl-5.20.3.eb
new file mode 100644
index 0000000000000000000000000000000000000000..926d8c87071f5cf14851d99bad06f144b5d6b1b3
--- /dev/null
+++ b/easybuild/easyconfigs/v/VCFtools/VCFtools-0.1.14-foss-2015b-Perl-5.20.3.eb
@@ -0,0 +1,42 @@
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+# Author: Pablo Escobar Lopez
+# Swiss Institute of Bioinformatics
+# Biozentrum - University of Basel
+# Author: Adam Huffman
+# adam.huffman@crick.ac.uk
+# The Francis Crick Institute
+
+easyblock = 'ConfigureMake'
+
+name = 'VCFtools'
+version = '0.1.14'
+
+homepage = "https://vcftools.github.io"
+description = """The aim of VCFtools is to provide 
+ easily accessible methods for working with complex 
+ genetic variation data in the form of VCF files."""
+
+toolchain = {'name': 'foss', 'version': '2015b'}
+toolchainopts = {'optarch': True}
+
+source_urls = ['https://github.com/%(namelower)s/%(namelower)s/releases/download/v%(version)s/']
+sources = ['%(namelower)s-%(version)s.tar.gz']
+
+perl = 'Perl'
+perlver = '5.20.3'
+versionsuffix = '-%s-%s' % (perl, perlver)
+
+dependencies = [
+    (perl, perlver),
+]
+
+files_to_copy = ["bin", "lib", "examples", (["bin/man1"], 'man')]
+
+modextrapaths = {'PERL5LIB': 'lib/perl5/site_perl'}
+
+sanity_check_paths = {
+    'files': ['bin/%s' % x for x in ['vcftools', 'vcf-sort', 'vcf-stats']],
+    'dirs': [],
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/v/VSC-tools/VSC-tools-0.1.2-goalf-1.1.0-no-OFED-Python-2.7.3.eb b/easybuild/easyconfigs/v/VSC-tools/VSC-tools-0.1.2-goalf-1.1.0-no-OFED-Python-2.7.3.eb
index 2f4453a35287981d3d66501f041c36552be4ea4c..31f3ed4ec2355b08e183a7b0f5f0a509d5fdcb2b 100644
--- a/easybuild/easyconfigs/v/VSC-tools/VSC-tools-0.1.2-goalf-1.1.0-no-OFED-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/v/VSC-tools/VSC-tools-0.1.2-goalf-1.1.0-no-OFED-Python-2.7.3.eb
@@ -7,9 +7,9 @@ description = """VSC-tools is a set of Python libraries and scripts that are com
 toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
 
 sources = [
-           'vsc-base-0.95.tar.gz',
-           'vsc-mympirun-3.0.5.tar.gz',
-          ]
+    'vsc-base-0.95.tar.gz',
+    'vsc-mympirun-3.0.5.tar.gz',
+]
 
 python = 'Python'
 pyver = '2.7.3'
diff --git a/easybuild/easyconfigs/v/VSC-tools/VSC-tools-0.1.2-ictce-4.1.13-Python-2.7.3.eb b/easybuild/easyconfigs/v/VSC-tools/VSC-tools-0.1.2-ictce-4.1.13-Python-2.7.3.eb
index efba5e0d07881ed36823b269d1db1ee33ac82f8f..cbae339789c98b4284f487de09d2da1f87ae2595 100644
--- a/easybuild/easyconfigs/v/VSC-tools/VSC-tools-0.1.2-ictce-4.1.13-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/v/VSC-tools/VSC-tools-0.1.2-ictce-4.1.13-Python-2.7.3.eb
@@ -7,9 +7,9 @@ description = """VSC-tools is a set of Python libraries and scripts that are com
 toolchain = {'name': 'ictce', 'version': '4.1.13'}
 
 sources = [
-           'vsc-base-0.95.tar.gz',
-           'vsc-mympirun-3.0.5.tar.gz',
-          ]
+    'vsc-base-0.95.tar.gz',
+    'vsc-mympirun-3.0.5.tar.gz',
+]
 
 python = 'Python'
 pyver = '2.7.3'
diff --git a/easybuild/easyconfigs/v/VSC-tools/VSC-tools-0.1.2-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/v/VSC-tools/VSC-tools-0.1.2-ictce-5.3.0-Python-2.7.3.eb
index 36fb089f672140ac240e14cfd10d79251a589714..4142cd2fe34204f27889fe87bb204e7c15dc5bd0 100644
--- a/easybuild/easyconfigs/v/VSC-tools/VSC-tools-0.1.2-ictce-5.3.0-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/v/VSC-tools/VSC-tools-0.1.2-ictce-5.3.0-Python-2.7.3.eb
@@ -8,9 +8,9 @@ description = """VSC-tools is a set of Python libraries and scripts that are com
 toolchain = {'name': 'ictce', 'version': '5.3.0'}
 
 sources = [
-           'vsc-base-0.95.tar.gz',
-           'vsc-mympirun-3.0.5.tar.gz',
-          ]
+    'vsc-base-0.95.tar.gz',
+    'vsc-mympirun-3.0.5.tar.gz',
+]
 
 python = 'Python'
 pyver = '2.7.3'
diff --git a/easybuild/easyconfigs/v/VTK/VTK-5.10.1-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/v/VTK/VTK-5.10.1-goalf-1.1.0-no-OFED.eb
index 8f65a96e35afb72c4ae63ccf85719030e6b1a549..d0373056bbef607f32a7750eb66314cf03559756 100644
--- a/easybuild/easyconfigs/v/VTK/VTK-5.10.1-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/v/VTK/VTK-5.10.1-goalf-1.1.0-no-OFED.eb
@@ -36,8 +36,8 @@ toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
 builddependencies = [('CMake', '2.8.4')]
 
 sanity_check_paths = {
-                      'files': ['bin/vtkEncodeString'],
-                      'dirs': ['lib/vtk-%s' % vermajor, 'include/vtk-%s' % vermajor]
-                     }
+    'files': ['bin/vtkEncodeString'],
+    'dirs': ['lib/vtk-%s' % vermajor, 'include/vtk-%s' % vermajor]
+}
 
 moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/v/VTK/VTK-5.10.1-ictce-4.0.6.eb b/easybuild/easyconfigs/v/VTK/VTK-5.10.1-ictce-4.0.6.eb
index 286f9e74f0b147419d72dbca8d112534e4e654e8..2a354f444a06175078d44db5c0c8b9a580611df8 100644
--- a/easybuild/easyconfigs/v/VTK/VTK-5.10.1-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/v/VTK/VTK-5.10.1-ictce-4.0.6.eb
@@ -36,8 +36,8 @@ toolchain = {'version': '4.0.6', 'name': 'ictce'}
 builddependencies = [('CMake', '2.8.4')]
 
 sanity_check_paths = {
-                      'files': ['bin/vtkEncodeString'],
-                      'dirs': ['lib/vtk-%s' % vermajor, 'include/vtk-%s' % vermajor]
-                     }
+    'files': ['bin/vtkEncodeString'],
+    'dirs': ['lib/vtk-%s' % vermajor, 'include/vtk-%s' % vermajor]
+}
 
 moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/v/VTK/VTK-5.10.1-ictce-5.3.0.eb b/easybuild/easyconfigs/v/VTK/VTK-5.10.1-ictce-5.3.0.eb
index 3d9b76d1f124986cc5547ecf3a8fc9a2f7984f2f..45d8b25c17eeabd4d197b287083f91a63d02fd68 100644
--- a/easybuild/easyconfigs/v/VTK/VTK-5.10.1-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/v/VTK/VTK-5.10.1-ictce-5.3.0.eb
@@ -36,8 +36,8 @@ toolchain = {'name': 'ictce', 'version': '5.3.0'}
 builddependencies = [('CMake', '2.8.4')]
 
 sanity_check_paths = {
-                      'files': ['bin/vtkEncodeString'],
-                      'dirs': ['lib/vtk-%s' % vermajor, 'include/vtk-%s' % vermajor]
-                     }
+    'files': ['bin/vtkEncodeString'],
+    'dirs': ['lib/vtk-%s' % vermajor, 'include/vtk-%s' % vermajor]
+}
 
 moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/v/Vampir/Vampir-8.4.1-demo.eb b/easybuild/easyconfigs/v/Vampir/Vampir-8.4.1-demo.eb
index 44f692903f0e41917736d8694c88fc073ec3a934..85c8901493df8ce7a7cf21daa9e00e033a79000f 100644
--- a/easybuild/easyconfigs/v/Vampir/Vampir-8.4.1-demo.eb
+++ b/easybuild/easyconfigs/v/Vampir/Vampir-8.4.1-demo.eb
@@ -30,7 +30,8 @@ sources = ['vampir-%s%s-%s-setup.bin' % (version, versionsuffix, variant)]
 # Adjust this variable to point to the location of your Vampir license file
 license_file = '/example/licenses/path/vampir.license'
 
-install_cmd = "./" + sources[0] + " --silent --instdir=%(installdir)s --no-icon --no-menu-items --no-trace-file-association"
+install_cmd = "./" + sources[0] + " --silent --instdir=%(installdir)s "
+install_cmd += "--no-icon --no-menu-items --no-trace-file-association"
 
 sanity_check_paths = {
     'files': ["bin/vampir", "doc/vampir-manual.pdf"],
diff --git a/easybuild/easyconfigs/v/Vampir/Vampir-8.4.1.eb b/easybuild/easyconfigs/v/Vampir/Vampir-8.4.1.eb
index 5596a89f02442f10f19bf1942e7d6af6aab59965..a25a9d20e8c19c28641fa3d25aa6b487b931cd74 100644
--- a/easybuild/easyconfigs/v/Vampir/Vampir-8.4.1.eb
+++ b/easybuild/easyconfigs/v/Vampir/Vampir-8.4.1.eb
@@ -33,7 +33,8 @@ checksums = [
 # Adjust this variable to point to the location of your Vampir license file
 license_file = '/example/licenses/path/vampir.license'
 
-install_cmd = "./" + sources[0] + " --silent --instdir=%(installdir)s --no-icon --no-menu-items --no-trace-file-association"
+install_cmd = "./" + sources[0] + " --silent --instdir=%(installdir)s "
+install_cmd += "--no-icon --no-menu-items --no-trace-file-association"
 
 sanity_check_paths = {
     'files': ["bin/vampir", "doc/vampir-manual.pdf"],
diff --git a/easybuild/easyconfigs/v/VampirServer/VampirServer-8.4.1-gompi-2015a.eb b/easybuild/easyconfigs/v/VampirServer/VampirServer-8.4.1-gompi-2015a.eb
index 09d9d1ef44a84180fff7473e5f1c72e2f74f4d90..6a972993654bc5fd14fdd85c1e983e22a890eb32 100644
--- a/easybuild/easyconfigs/v/VampirServer/VampirServer-8.4.1-gompi-2015a.eb
+++ b/easybuild/easyconfigs/v/VampirServer/VampirServer-8.4.1-gompi-2015a.eb
@@ -34,7 +34,8 @@ checksums = [
 # Adjust this variable to point to the location of your Vampir license file
 license_file = '/example/licenses/path/vampir.license'
 
-install_cmd = "./" + sources[0] + " --silent --instdir=%(installdir)s && %(installdir)s/bin/vampirserver config --silent"
+install_cmd = "./" + sources[0] + " --silent --instdir=%(installdir)s && "
+install_cmd += "%(installdir)s/bin/vampirserver config --silent"
 
 sanity_check_paths = {
     'files': ["bin/vampirserver", "doc/vampirserver-manual.pdf", "lib/vampirserver-driver.%s" % SHLIB_EXT],
diff --git a/easybuild/easyconfigs/v/VarScan/VarScan-2.4.1-Java-1.7.0_80.eb b/easybuild/easyconfigs/v/VarScan/VarScan-2.4.1-Java-1.7.0_80.eb
new file mode 100644
index 0000000000000000000000000000000000000000..5f66c5f283f1241f4c264b347170fe27d6aa262b
--- /dev/null
+++ b/easybuild/easyconfigs/v/VarScan/VarScan-2.4.1-Java-1.7.0_80.eb
@@ -0,0 +1,29 @@
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+# Author: Adam Huffman, based on initial work by Jordi Blasco
+# The Francis Crick Institute
+
+easyblock = 'JAR'
+
+name = 'VarScan'
+version = '2.4.1'
+
+homepage = 'https://github.com/dkoboldt/varscan'
+description = """Variant calling and somatic mutation/CNV detection for next-generation sequencing data"""
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+sources = ['%(name)s.v%(version)s.jar']
+source_urls = ['https://github.com/dkoboldt/varscan/releases/download/v%(version)s']
+
+java = 'Java'
+javaver = '1.7.0_80'
+versionsuffix = '-%s-%s' % (java, javaver)
+
+dependencies = [(java, javaver)]
+
+sanity_check_paths = {
+    'files': sources,
+    'dirs': [],
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/v/Velvet/Velvet-1.2.10-goolf-1.4.10-mt-kmer_31.eb b/easybuild/easyconfigs/v/Velvet/Velvet-1.2.10-goolf-1.4.10-mt-kmer_31.eb
index 9c3573c3bcf6275700ce280942843be11520ea49..7c27a7683f714a47d948e0e9a92200d3492c2d22 100644
--- a/easybuild/easyconfigs/v/Velvet/Velvet-1.2.10-goolf-1.4.10-mt-kmer_31.eb
+++ b/easybuild/easyconfigs/v/Velvet/Velvet-1.2.10-goolf-1.4.10-mt-kmer_31.eb
@@ -23,4 +23,6 @@ source_urls = ['http://www.ebi.ac.uk/~zerbino/%(namelower)s']
 # by default MAXKMERLENGTH=31 but defined here to keep all the easyconfigs homogeneous
 buildopts = "OPENMP=1 MAXKMERLENGTH=%s" % versionsuffix.split('_')[1]
 
+postinstallcmds = ["cd contrib/MetaVelvet-1.* && make && cd ../../ && cp -a contrib %(installdir)s/"]
+
 moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/v/Velvet/Velvet-1.2.10-goolf-1.4.10-mt-kmer_57.eb b/easybuild/easyconfigs/v/Velvet/Velvet-1.2.10-goolf-1.4.10-mt-kmer_57.eb
index 3556eea248ec9b27f0cdf1472db0b57533f54099..8457ee49034b0b489d2f8a2930debc46d7f0519f 100644
--- a/easybuild/easyconfigs/v/Velvet/Velvet-1.2.10-goolf-1.4.10-mt-kmer_57.eb
+++ b/easybuild/easyconfigs/v/Velvet/Velvet-1.2.10-goolf-1.4.10-mt-kmer_57.eb
@@ -22,4 +22,6 @@ source_urls = ['http://www.ebi.ac.uk/~zerbino/%(namelower)s']
 
 buildopts = "OPENMP=1 MAXKMERLENGTH=%s" % versionsuffix.split('_')[1]
 
+postinstallcmds = ["cd contrib/MetaVelvet-1.* && make && cd ../../ && cp -a contrib %(installdir)s/"]
+
 moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/v/Velvet/Velvet-1.2.10-goolf-1.4.10-mt-kmer_63.eb b/easybuild/easyconfigs/v/Velvet/Velvet-1.2.10-goolf-1.4.10-mt-kmer_63.eb
index 56dd2ed0943b4affc4142c2232e09d40986e51d6..ad56fb1790ddd000066e37dff05367672dc304a4 100644
--- a/easybuild/easyconfigs/v/Velvet/Velvet-1.2.10-goolf-1.4.10-mt-kmer_63.eb
+++ b/easybuild/easyconfigs/v/Velvet/Velvet-1.2.10-goolf-1.4.10-mt-kmer_63.eb
@@ -22,4 +22,6 @@ source_urls = ['http://www.ebi.ac.uk/~zerbino/%(namelower)s']
 
 buildopts = "OPENMP=1 MAXKMERLENGTH=%s" % versionsuffix.split('_')[1]
 
+postinstallcmds = ["cd contrib/MetaVelvet-1.* && make && cd ../../ && cp -a contrib %(installdir)s/"]
+
 moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/v/Velvet/Velvet-1.2.10-intel-2015b-mt-kmer_100.eb b/easybuild/easyconfigs/v/Velvet/Velvet-1.2.10-intel-2015b-mt-kmer_100-Perl-5.20.3.eb
similarity index 73%
rename from easybuild/easyconfigs/v/Velvet/Velvet-1.2.10-intel-2015b-mt-kmer_100.eb
rename to easybuild/easyconfigs/v/Velvet/Velvet-1.2.10-intel-2015b-mt-kmer_100-Perl-5.20.3.eb
index 70b05647b0dfd601fc21a77d66a4b016bddbead7..d05f4f9c7ac2a53b2d999f89d699c1621d2c6160 100644
--- a/easybuild/easyconfigs/v/Velvet/Velvet-1.2.10-intel-2015b-mt-kmer_100.eb
+++ b/easybuild/easyconfigs/v/Velvet/Velvet-1.2.10-intel-2015b-mt-kmer_100-Perl-5.20.3.eb
@@ -13,7 +13,6 @@
 
 name = 'Velvet'
 version = '1.2.10'
-versionsuffix = '-mt-kmer_100'
 
 homepage = 'http://www.ebi.ac.uk/~zerbino/velvet/'
 description = """Sequence assembler for very short reads"""
@@ -24,6 +23,17 @@ toolchainopts = {'optarch': True, 'pic': True, 'openmp': True}
 sources = ['%(namelower)s_%(version)s.tgz']
 source_urls = ['http://www.ebi.ac.uk/~zerbino/%(namelower)s']
 
-buildopts = "OPENMP=1 MAXKMERLENGTH=%s" % versionsuffix.split('_')[1]
+perlver = '5.20.3'
+kmer = '100'
+versionsuffix = '-mt-kmer_%s-Perl-%%(perlver)s' % kmer
+
+dependencies = [
+    ('Perl', perlver),
+    ('BioPerl', '1.6.923', '-Perl-%(perlver)s'),
+]
+
+buildopts = "OPENMP=1 MAXKMERLENGTH=%s" % kmer
+
+postinstallcmds = ["cd contrib/MetaVelvet-1.* && make && cd ../../ && cp -a contrib %(installdir)s/"]
 
 moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/v/Velvet/Velvet-1.2.10-intel-2015b-mt-kmer_31.eb b/easybuild/easyconfigs/v/Velvet/Velvet-1.2.10-intel-2015b-mt-kmer_31-Perl-5.20.3.eb
similarity index 74%
rename from easybuild/easyconfigs/v/Velvet/Velvet-1.2.10-intel-2015b-mt-kmer_31.eb
rename to easybuild/easyconfigs/v/Velvet/Velvet-1.2.10-intel-2015b-mt-kmer_31-Perl-5.20.3.eb
index fff6a988abda5ba439621c5d1302f104f628d30b..fe2df81ad07432b1fec122de1075586f08392b52 100644
--- a/easybuild/easyconfigs/v/Velvet/Velvet-1.2.10-intel-2015b-mt-kmer_31.eb
+++ b/easybuild/easyconfigs/v/Velvet/Velvet-1.2.10-intel-2015b-mt-kmer_31-Perl-5.20.3.eb
@@ -13,7 +13,6 @@
 
 name = 'Velvet'
 version = '1.2.10'
-versionsuffix = '-mt-kmer_31'
 
 homepage = 'http://www.ebi.ac.uk/~zerbino/velvet/'
 description = """Sequence assembler for very short reads"""
@@ -24,7 +23,19 @@ toolchainopts = {'optarch': True, 'pic': True, 'openmp': True}
 sources = ['%(namelower)s_%(version)s.tgz']
 source_urls = ['http://www.ebi.ac.uk/~zerbino/%(namelower)s']
 
+perl = 'Perl'
+perlver = '5.20.3'
+kmer = '31'
+versionsuffix = '-mt-kmer_%s-Perl-%%(perlver)s' % kmer
+
+dependencies = [
+    ('Perl', perlver),
+    ('BioPerl', '1.6.923', '-Perl-%(perlver)s'),
+]
+
 # by default MAXKMERLENGTH=31 but defined here to keep all the easyconfigs homogeneous
-buildopts = "OPENMP=1 MAXKMERLENGTH=%s" % versionsuffix.split('_')[1]
+buildopts = "OPENMP=1 MAXKMERLENGTH=%s" % kmer
+
+postinstallcmds = ["cd contrib/MetaVelvet-1.* && make && cd ../../ && cp -a contrib %(installdir)s/"]
 
 moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/v/ViennaRNA/ViennaRNA-2.0.7-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/v/ViennaRNA/ViennaRNA-2.0.7-goalf-1.1.0-no-OFED.eb
index 3f61b9470551c79e90090e73adcfbd5695ebe141..740784c81214232502ddf3c6c8a632d5bd4be81c 100644
--- a/easybuild/easyconfigs/v/ViennaRNA/ViennaRNA-2.0.7-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/v/ViennaRNA/ViennaRNA-2.0.7-goalf-1.1.0-no-OFED.eb
@@ -32,13 +32,13 @@ configopts = '--without-perl'
 #preconfigopts = 'PERLPREFIX="/path/where/the/perl/module/shoud/go"'
 
 sanity_check_paths = {
-                      'files': ['bin/RNA%s' % x for x in ['fold', 'eval', 'heat', 'pdist', 'distance',
-                                                          'inverse', 'plot', 'subopt', 'Lfold', 'cofold',
-                                                          'paln', 'duplex', 'alifold', 'plfold', 'up',
-                                                          'aliduplex', 'Lalifold', '2Dfold', 'parconv',
-                                                          'PKplex', 'plex', 'snoop', 'forester']] +
-                               ['bin/Kinfold'],
-                      'dirs': []
-                     }
+    'files': ['bin/RNA%s' % x for x in ['fold', 'eval', 'heat', 'pdist', 'distance',
+                                        'inverse', 'plot', 'subopt', 'Lfold', 'cofold',
+                                        'paln', 'duplex', 'alifold', 'plfold', 'up',
+                                        'aliduplex', 'Lalifold', '2Dfold', 'parconv',
+                                        'PKplex', 'plex', 'snoop', 'forester']] +
+    ['bin/Kinfold'],
+    'dirs': []
+}
 
 moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/v/ViennaRNA/ViennaRNA-2.0.7-goolf-1.4.10.eb b/easybuild/easyconfigs/v/ViennaRNA/ViennaRNA-2.0.7-goolf-1.4.10.eb
index 6f92dee8377002961466f6b8d2090e0fc3b360f0..327bd773ebd30f710439e4b1e88bf19d281767a7 100644
--- a/easybuild/easyconfigs/v/ViennaRNA/ViennaRNA-2.0.7-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/v/ViennaRNA/ViennaRNA-2.0.7-goolf-1.4.10.eb
@@ -37,7 +37,7 @@ sanity_check_paths = {
                                         'paln', 'duplex', 'alifold', 'plfold', 'up',
                                         'aliduplex', 'Lalifold', '2Dfold', 'parconv',
                                         'PKplex', 'plex', 'snoop', 'forester']] +
-             ['bin/Kinfold'],
+    ['bin/Kinfold'],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/v/ViennaRNA/ViennaRNA-2.0.7-ictce-4.0.6.eb b/easybuild/easyconfigs/v/ViennaRNA/ViennaRNA-2.0.7-ictce-4.0.6.eb
index 68de4eec04c70af41afa6b6b1330ae0a7a841b13..375b58016f98221a819281f38e618bd925f655a9 100644
--- a/easybuild/easyconfigs/v/ViennaRNA/ViennaRNA-2.0.7-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/v/ViennaRNA/ViennaRNA-2.0.7-ictce-4.0.6.eb
@@ -34,13 +34,13 @@ configopts = '--without-perl'
 #preconfigopts = 'PERLPREFIX="/path/where/the/perl/module/shoud/go"'
 
 sanity_check_paths = {
-                      'files': ['bin/RNA%s' % x for x in ['fold', 'eval', 'heat', 'pdist', 'distance',
-                                                          'inverse', 'plot', 'subopt', 'Lfold', 'cofold',
-                                                          'paln', 'duplex', 'alifold', 'plfold', 'up',
-                                                          'aliduplex', 'Lalifold', '2Dfold', 'parconv',
-                                                          'PKplex', 'plex', 'snoop', 'forester']] +
-                               ['bin/Kinfold'],
-                      'dirs': []
-                     }
+    'files': ['bin/RNA%s' % x for x in ['fold', 'eval', 'heat', 'pdist', 'distance',
+                                        'inverse', 'plot', 'subopt', 'Lfold', 'cofold',
+                                        'paln', 'duplex', 'alifold', 'plfold', 'up',
+                                        'aliduplex', 'Lalifold', '2Dfold', 'parconv',
+                                        'PKplex', 'plex', 'snoop', 'forester']] +
+    ['bin/Kinfold'],
+    'dirs': []
+}
 
 moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/v/ViennaRNA/ViennaRNA-2.0.7-ictce-5.3.0.eb b/easybuild/easyconfigs/v/ViennaRNA/ViennaRNA-2.0.7-ictce-5.3.0.eb
index 14f9815f66cd710b19acdaca677393acb583a671..316c43df98161f2ff6450634ca06bc465b1370ca 100644
--- a/easybuild/easyconfigs/v/ViennaRNA/ViennaRNA-2.0.7-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/v/ViennaRNA/ViennaRNA-2.0.7-ictce-5.3.0.eb
@@ -35,13 +35,13 @@ configopts = '--without-perl'
 #preconfigopts = 'PERLPREFIX="/path/where/the/perl/module/shoud/go"'
 
 sanity_check_paths = {
-                      'files': ['bin/RNA%s' % x for x in ['fold', 'eval', 'heat', 'pdist', 'distance',
-                                                          'inverse', 'plot', 'subopt', 'Lfold', 'cofold',
-                                                          'paln', 'duplex', 'alifold', 'plfold', 'up',
-                                                          'aliduplex', 'Lalifold', '2Dfold', 'parconv',
-                                                          'PKplex', 'plex', 'snoop', 'forester']] +
-                               ['bin/Kinfold'],
-                      'dirs': []
-                     }
+    'files': ['bin/RNA%s' % x for x in ['fold', 'eval', 'heat', 'pdist', 'distance',
+                                        'inverse', 'plot', 'subopt', 'Lfold', 'cofold',
+                                        'paln', 'duplex', 'alifold', 'plfold', 'up',
+                                        'aliduplex', 'Lalifold', '2Dfold', 'parconv',
+                                        'PKplex', 'plex', 'snoop', 'forester']] +
+    ['bin/Kinfold'],
+    'dirs': []
+}
 
 moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/v/ViennaRNA/ViennaRNA-2.1.6-ictce-5.5.0.eb b/easybuild/easyconfigs/v/ViennaRNA/ViennaRNA-2.1.6-ictce-5.5.0.eb
index 281ecf7b59fe49b46c9b17e137c8d62728ac5b50..d9a8ebec9218981b9e951731fb72c598d454fdf6 100644
--- a/easybuild/easyconfigs/v/ViennaRNA/ViennaRNA-2.1.6-ictce-5.5.0.eb
+++ b/easybuild/easyconfigs/v/ViennaRNA/ViennaRNA-2.1.6-ictce-5.5.0.eb
@@ -19,7 +19,7 @@ homepage = 'http://www.tbi.univie.ac.at/~ronny/RNA/vrna2.html'
 description = """The Vienna RNA Package consists of a C code library and several
 stand-alone programs for the prediction and comparison of RNA secondary structures."""
 
-toolchain = {'name': 'ictce', 'version': '5.5.0' }
+toolchain = {'name': 'ictce', 'version': '5.5.0'}
 toolchainopts = {'optarch': True, 'pic': True}
 
 sources = [SOURCE_TAR_GZ]
@@ -39,9 +39,8 @@ sanity_check_paths = {
                                         'paln', 'duplex', 'alifold', 'plfold', 'up',
                                         'aliduplex', 'Lalifold', '2Dfold', 'parconv',
                                         'PKplex', 'plex', 'snoop', 'forester']] +
-             ['bin/Kinfold'],
+    ['bin/Kinfold'],
     'dirs': [],
 }
 
 moduleclass = 'bio'
-
diff --git a/easybuild/easyconfigs/v/Vim/Vim-7.4-goolf-1.4.10.eb b/easybuild/easyconfigs/v/Vim/Vim-7.4-goolf-1.4.10.eb
index 9ed98058b97d7cca29e22c5aaeccbedca22717e8..824152274f5ea91bf82f8a7b2d058be47e1931e8 100644
--- a/easybuild/easyconfigs/v/Vim/Vim-7.4-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/v/Vim/Vim-7.4-goolf-1.4.10.eb
@@ -22,12 +22,12 @@ sources = [SOURCELOWER_TAR_BZ2]
 dependencies = [
     ('Python', '2.7.5'),
     ('Perl', '5.16.3')
-    ]
+]
 
 configopts = '--with-features=huge --enable-pythoninterp=yes --enable-perlinterp=yes'
 
 sanity_check_paths = {
-    'files': ['bin/vim','bin/vimdiff'],
+    'files': ['bin/vim', 'bin/vimdiff'],
     'dirs': [],
 }
 
diff --git a/easybuild/easyconfigs/v/Viper/Viper-1.0.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb b/easybuild/easyconfigs/v/Viper/Viper-1.0.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb
index ba86942900458db7a8a842a539a7280650df9b7c..66555db5aacfb9d5cf3fec23ac30341691df44cf 100644
--- a/easybuild/easyconfigs/v/Viper/Viper-1.0.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/v/Viper/Viper-1.0.0-goalf-1.1.0-no-OFED-Python-2.7.3.eb
@@ -26,8 +26,8 @@ dependencies = [(python, pythonversion)]
 options = {'modulename': 'os'}
 
 sanity_check_paths = {
-                      'files': [],
-                      'dirs': ['bin', 'lib/python%s/site-packages/viper' % pythonshortversion]
-                     }
+    'files': [],
+    'dirs': ['bin', 'lib/python%s/site-packages/viper' % pythonshortversion]
+}
 
 moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/v/Viper/Viper-1.0.0-ictce-4.0.6-Python-2.7.3.eb b/easybuild/easyconfigs/v/Viper/Viper-1.0.0-ictce-4.0.6-Python-2.7.3.eb
index 45f56436e0ac6f5508380ebbd9425c68f8ff8e45..031d7e98f103d8f12acf6ca25af97e2d48b13a2f 100644
--- a/easybuild/easyconfigs/v/Viper/Viper-1.0.0-ictce-4.0.6-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/v/Viper/Viper-1.0.0-ictce-4.0.6-Python-2.7.3.eb
@@ -26,8 +26,8 @@ dependencies = [(python, pythonversion)]
 options = {'modulename': 'os'}
 
 sanity_check_paths = {
-                      'files': [],
-                      'dirs': ['bin', 'lib/python%s/site-packages/viper' % pythonshortversion]
-                     }
+    'files': [],
+    'dirs': ['bin', 'lib/python%s/site-packages/viper' % pythonshortversion]
+}
 
 moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/v/Viper/Viper-1.0.0-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/v/Viper/Viper-1.0.0-ictce-5.3.0-Python-2.7.3.eb
index 144a9dcc467e291ea979832677dac94d6b4341fd..5c807c96fb6c38f4b2e0ec9c19854898272ad46a 100644
--- a/easybuild/easyconfigs/v/Viper/Viper-1.0.0-ictce-5.3.0-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/v/Viper/Viper-1.0.0-ictce-5.3.0-Python-2.7.3.eb
@@ -27,8 +27,8 @@ dependencies = [(python, pythonversion)]
 options = {'modulename': 'os'}
 
 sanity_check_paths = {
-                      'files': [],
-                      'dirs': ['bin', 'lib/python%s/site-packages/viper' % pythonshortversion]
-                     }
+    'files': [],
+    'dirs': ['bin', 'lib/python%s/site-packages/viper' % pythonshortversion]
+}
 
 moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/v/vincent/vincent-0.4.4-intel-2015a-Python-2.7.10.eb b/easybuild/easyconfigs/v/vincent/vincent-0.4.4-intel-2015a-Python-2.7.10.eb
index f23a488554748b2ad9d53333b85c58f00ed6ae0d..0c1009a3abf84f930e70faace840396bb3036d80 100644
--- a/easybuild/easyconfigs/v/vincent/vincent-0.4.4-intel-2015a-Python-2.7.10.eb
+++ b/easybuild/easyconfigs/v/vincent/vincent-0.4.4-intel-2015a-Python-2.7.10.eb
@@ -10,7 +10,7 @@ description = """Vincent takes Python data structures (tuples, lists, dicts, and
 
 toolchain = {'name': 'intel', 'version': '2015a'}
 
-source_urls  = [PYPI_SOURCE]
+source_urls = [PYPI_SOURCE]
 sources = [SOURCELOWER_TAR_GZ]
 
 python = 'Python'
diff --git a/easybuild/easyconfigs/v/vincent/vincent-0.4.4-intel-2015b-Python-2.7.10.eb b/easybuild/easyconfigs/v/vincent/vincent-0.4.4-intel-2015b-Python-2.7.10.eb
index 3ee6bac25354c737465b0e2def69078a5d25cedf..c16f8a1ce66f5c86eff389f4ca7f946769df0a31 100644
--- a/easybuild/easyconfigs/v/vincent/vincent-0.4.4-intel-2015b-Python-2.7.10.eb
+++ b/easybuild/easyconfigs/v/vincent/vincent-0.4.4-intel-2015b-Python-2.7.10.eb
@@ -10,7 +10,7 @@ description = """Vincent takes Python data structures (tuples, lists, dicts, and
 
 toolchain = {'name': 'intel', 'version': '2015b'}
 
-source_urls  = [PYPI_SOURCE]
+source_urls = [PYPI_SOURCE]
 sources = [SOURCELOWER_TAR_GZ]
 
 python = 'Python'
diff --git a/easybuild/easyconfigs/v/vsc-base/vsc-base-2.4.17-intel-2015b-Python-2.7.11.eb b/easybuild/easyconfigs/v/vsc-base/vsc-base-2.4.17-intel-2015b-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..29c125cb6e0aee79efccebbed85f9a9280ea946b
--- /dev/null
+++ b/easybuild/easyconfigs/v/vsc-base/vsc-base-2.4.17-intel-2015b-Python-2.7.11.eb
@@ -0,0 +1,28 @@
+easyblock = 'PythonPackage'
+
+name = 'vsc-base'
+version = '2.4.17'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'https://pypi.python.org/pypi/vsc-base'
+description = """Base library for Python tools developed by UGent's HPC group, including generaloption (option parser)
+and fancylogger (logging functionality)."""
+
+toolchain = {'name': 'intel', 'version': '2015b'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = [PYPI_SOURCE]
+
+dependencies = [
+    ('Python', '2.7.11'),
+    ('vsc-install', '0.9.18', versionsuffix),
+]
+
+options = {'modulename': 'vsc.utils.fancylogger'}
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%(pyshortver)s/site-packages'],
+}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/v/vsc-base/vsc-base-2.4.17-intel-2016a-Python-2.7.11.eb b/easybuild/easyconfigs/v/vsc-base/vsc-base-2.4.17-intel-2016a-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..bf597beacdfa0ab8f1cb8e39c2fbc2f3c4e1e22f
--- /dev/null
+++ b/easybuild/easyconfigs/v/vsc-base/vsc-base-2.4.17-intel-2016a-Python-2.7.11.eb
@@ -0,0 +1,28 @@
+easyblock = 'PythonPackage'
+
+name = 'vsc-base'
+version = '2.4.17'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'https://pypi.python.org/pypi/vsc-base'
+description = """Base library for Python tools developed by UGent's HPC group, including generaloption (option parser)
+and fancylogger (logging functionality)."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = [PYPI_SOURCE]
+
+dependencies = [
+    ('Python', '2.7.11'),
+    ('vsc-install', '0.9.18', versionsuffix),
+]
+
+options = {'modulename': 'vsc.utils.fancylogger'}
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%(pyshortver)s/site-packages'],
+}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/v/vsc-install/vsc-install-0.9.18-intel-2015b-Python-2.7.11.eb b/easybuild/easyconfigs/v/vsc-install/vsc-install-0.9.18-intel-2015b-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..d0d69c63a64ce6f022f375b9438162a96ad58472
--- /dev/null
+++ b/easybuild/easyconfigs/v/vsc-install/vsc-install-0.9.18-intel-2015b-Python-2.7.11.eb
@@ -0,0 +1,27 @@
+easyblock = 'PythonPackage'
+
+name = 'vsc-install'
+version = '0.9.18'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'https://pypi.python.org/pypi/vsc-install'
+description = """vsc-install provides shared setuptools functions and classes for Python libraries
+ developed by UGent's HPC group"""
+
+toolchain = {'name': 'intel', 'version': '2015b'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = [PYPI_SOURCE]
+
+dependencies = [
+    ('Python', '2.7.11'),
+]
+
+options = {'modulename': 'vsc.install'}
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%(pyshortver)s/site-packages'],
+}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/v/vsc-install/vsc-install-0.9.18-intel-2016a-Python-2.7.11.eb b/easybuild/easyconfigs/v/vsc-install/vsc-install-0.9.18-intel-2016a-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..a3123a79e4f19c36097fc60b415059ae922404ab
--- /dev/null
+++ b/easybuild/easyconfigs/v/vsc-install/vsc-install-0.9.18-intel-2016a-Python-2.7.11.eb
@@ -0,0 +1,27 @@
+easyblock = 'PythonPackage'
+
+name = 'vsc-install'
+version = '0.9.18'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'https://pypi.python.org/pypi/vsc-install'
+description = """vsc-install provides shared setuptools functions and classes for Python libraries
+ developed by UGent's HPC group"""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = [PYPI_SOURCE]
+
+dependencies = [
+    ('Python', '2.7.11'),
+]
+
+options = {'modulename': 'vsc.install'}
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%(pyshortver)s/site-packages'],
+}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/v/vsc-mympirun-scoop/vsc-mympirun-scoop-3.4.1-intel-2015b-Python-2.7.10.eb b/easybuild/easyconfigs/v/vsc-mympirun-scoop/vsc-mympirun-scoop-3.4.1-intel-2015b-Python-2.7.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..24d1ff604f733aad96ba1b21decdca016ece8607
--- /dev/null
+++ b/easybuild/easyconfigs/v/vsc-mympirun-scoop/vsc-mympirun-scoop-3.4.1-intel-2015b-Python-2.7.10.eb
@@ -0,0 +1,32 @@
+easyblock = 'VSCPythonPackage'
+
+name = 'vsc-mympirun-scoop'
+version = '3.4.1'
+
+homepage = 'http://hpcugent.github.com/vsc-mympirun/'
+description = """VSC-tools is a set of Python libraries and scripts that are commonly used within HPC-UGent."""
+
+# we build this to work with every python version
+toolchain = {'name': 'intel', 'version': '2015b'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = ['https://github.com/hpcugent/vsc-mympirun-scoop/archive/']
+
+python = 'Python'
+pyver = '2.7.10'
+versionsuffix = '-%s-%s' % (python, pyver)
+dependencies = [
+    ('vsc-processcontrol', '1.0', '-vsc-base-2.1.2', True),
+    ('vsc-mympirun', '3.4.2', '', True),
+    (python, pyver),
+    ('SCOOP', '0.6.2', versionsuffix),
+]
+
+options = {'modulename': 'vsc.mympirun.scoop'}
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/vsc/mympirun/scoop'],
+}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/v/vsc-mympirun/vsc-mympirun-3.4.2-intel-2015b-Python-2.7.11-vsc-base-2.4.17.eb b/easybuild/easyconfigs/v/vsc-mympirun/vsc-mympirun-3.4.2-intel-2015b-Python-2.7.11-vsc-base-2.4.17.eb
new file mode 100644
index 0000000000000000000000000000000000000000..100ec4fa9418f5b61f19718678f9ecc95b4f0e28
--- /dev/null
+++ b/easybuild/easyconfigs/v/vsc-mympirun/vsc-mympirun-3.4.2-intel-2015b-Python-2.7.11-vsc-base-2.4.17.eb
@@ -0,0 +1,32 @@
+easyblock = 'PythonPackage'
+
+name = 'vsc-mympirun'
+version = '3.4.2'
+
+homepage = 'https://github.com/hpcugent/vsc-mympirun'
+description = """VSC-tools is a set of Python libraries and scripts that are commonly used within HPC-UGent."""
+
+toolchain = {'name': 'intel', 'version': '2015b'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = ['https://github.com/hpcugent/vsc-mympirun/archive/']
+
+vsc_base_ver = '2.4.17'
+versionsuffix = '-Python-%%(pyver)s-vsc-base-%s' % vsc_base_ver
+
+dependencies = [
+    ('Python', '2.7.11'),
+    ('vsc-base', vsc_base_ver, '-Python-%(pyver)s'),
+]
+
+# we ship something in bin/fake
+modextrapaths = {'PATH': 'bin/fake'}
+
+options = {'modulename': 'vsc.mympirun'}
+
+sanity_check_paths = {
+    'files': ['bin/mympirun'],
+    'dirs': ['lib/python%(pyshortver)s/site-packages'],
+}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/v/vsc-mympirun/vsc-mympirun-3.4.2-intel-2016a-Python-2.7.11-vsc-base-2.4.17.eb b/easybuild/easyconfigs/v/vsc-mympirun/vsc-mympirun-3.4.2-intel-2016a-Python-2.7.11-vsc-base-2.4.17.eb
new file mode 100755
index 0000000000000000000000000000000000000000..9ff223125fd9b893ab73745aa54ca13461f34593
--- /dev/null
+++ b/easybuild/easyconfigs/v/vsc-mympirun/vsc-mympirun-3.4.2-intel-2016a-Python-2.7.11-vsc-base-2.4.17.eb
@@ -0,0 +1,32 @@
+easyblock = 'PythonPackage'
+
+name = 'vsc-mympirun'
+version = '3.4.2'
+
+homepage = 'https://github.com/hpcugent/vsc-mympirun'
+description = """VSC-tools is a set of Python libraries and scripts that are commonly used within HPC-UGent."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = ['https://github.com/hpcugent/vsc-mympirun/archive/']
+
+vsc_base_ver = '2.4.17'
+versionsuffix = '-Python-%%(pyver)s-vsc-base-%s' % vsc_base_ver
+
+dependencies = [
+    ('Python', '2.7.11'),
+    ('vsc-base', vsc_base_ver, '-Python-%(pyver)s'),
+]
+
+# we ship something in bin/fake
+modextrapaths = {'PATH': 'bin/fake'}
+
+options = {'modulename': 'vsc.mympirun'}
+
+sanity_check_paths = {
+    'files': ['bin/mympirun'],
+    'dirs': ['lib/python%(pyshortver)s/site-packages'],
+}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/w/WEKA/WEKA-3.7.0-Java-1.7.0_80.eb b/easybuild/easyconfigs/w/WEKA/WEKA-3.7.0-Java-1.7.0_80.eb
new file mode 100644
index 0000000000000000000000000000000000000000..396230d2a7d10f1aabd6af04d686cdf70f835760
--- /dev/null
+++ b/easybuild/easyconfigs/w/WEKA/WEKA-3.7.0-Java-1.7.0_80.eb
@@ -0,0 +1,40 @@
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+# Author: Pablo Escobar Lopez
+# Swiss Institute of Bioinformatics
+# Biozentrum - University of Basel
+
+easyblock = "Tarball"
+
+name = 'WEKA'
+version = '3.7.0'
+
+homepage = 'http://www.cs.waikato.ac.nz/ml/weka/index.html'
+description = """ Weka is a collection of machine learning algorithms for data mining tasks. 
+ The algorithms can either be applied directly to a dataset or called from your own Java code. 
+ Weka contains tools for data pre-processing, classification, regression, clustering, 
+ association rules, and visualization. It is also well-suited for developing new machine 
+ learning schemes."""
+
+toolchain = {'name': 'dummy', 'version': ''}
+
+source_urls = ['http://prdownloads.sourceforge.net/weka/']
+sources = ['%s-%s.zip' % (name.lower(), version.replace('.', '-'))]
+
+java = 'Java'
+javaver = '1.7.0_80'
+versionsuffix = '-%s-%s' % (java, javaver)
+
+dependencies = [(java, javaver)]
+
+sanity_check_paths = {
+    'files': ["weka.jar"],
+    'dirs': []
+}
+
+modextravars = {
+    'WEKAINSTALL': '$root',
+}
+
+modloadmsg = " execute WEKA: java -jar \\$EBROOTWEKA/weka.jar "
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/w/WIEN2k/WIEN2k-12.1-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/w/WIEN2k/WIEN2k-12.1-goalf-1.1.0-no-OFED.eb
index 77cc5a82b087be48b1a2927f8a745811877fa61b..c324b952c661d41501b299f28cf1f20dcd7ee32a 100644
--- a/easybuild/easyconfigs/w/WIEN2k/WIEN2k-12.1-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/w/WIEN2k/WIEN2k-12.1-goalf-1.1.0-no-OFED.eb
@@ -16,16 +16,16 @@ patches = ['WIEN2k-12.1_fix-range-array-constructor.patch']
 osdependencies = ['libpthread.a']  # delivered by glibc-static or glibc-devel
 
 tests = [
-      # test case 1: NaCl
-         ('NaCl', '-b', '-i 3', [r'^:DIS.*0.1227', r'^:ENE.*-1248.1427']),
-      # test case 2: TiO2
-         ('TiO2',
-          '-b -numk 1000 -rkmax 7.5',
-          '-in1ef -cc 0.00001 -fc 0.5 -i 100',
-          [r'^:ENE.*-4018.0761',
-           r'^:FGL001.*\s+[0.]+\s+[0.]+\s+[0.]+\s+total forces',
-           r'^:FGL002.*14.63.*total forces'
-          ])
-        ]
+    # test case 1: NaCl
+    ('NaCl', '-b', '-i 3', [r'^:DIS.*0.1227', r'^:ENE.*-1248.1427']),
+    # test case 2: TiO2
+    ('TiO2',
+     '-b -numk 1000 -rkmax 7.5',
+     '-in1ef -cc 0.00001 -fc 0.5 -i 100',
+     [r'^:ENE.*-4018.0761',
+      r'^:FGL001.*\s+[0.]+\s+[0.]+\s+[0.]+\s+total forces',
+      r'^:FGL002.*14.63.*total forces'
+      ])
+]
 
 moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/w/WIEN2k/WIEN2k-12.1-goolf-1.4.10.eb b/easybuild/easyconfigs/w/WIEN2k/WIEN2k-12.1-goolf-1.4.10.eb
index 244607e4e41b897541727917bd8d7cda0f09a8bb..074aab4b4ca3398c9efef93551cd6a0f89b320f7 100644
--- a/easybuild/easyconfigs/w/WIEN2k/WIEN2k-12.1-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/w/WIEN2k/WIEN2k-12.1-goolf-1.4.10.eb
@@ -25,7 +25,7 @@ tests = [
         [r'^:ENE.*-4018.0761',
          r'^:FGL001.*\s+[0.]+\s+[0.]+\s+[0.]+\s+total forces',
          r'^:FGL002.*14.63.*total forces'
-        ]),
+         ]),
 ]
 
 moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/w/WIEN2k/WIEN2k-12.1-ictce-4.0.6.eb b/easybuild/easyconfigs/w/WIEN2k/WIEN2k-12.1-ictce-4.0.6.eb
index 924f23b3b4c5f234689bf64c66bd2d9dba7d1a23..233776585c8bef0ff5b1ef42f08d3d57e900860a 100644
--- a/easybuild/easyconfigs/w/WIEN2k/WIEN2k-12.1-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/w/WIEN2k/WIEN2k-12.1-ictce-4.0.6.eb
@@ -18,16 +18,16 @@ dependencies = [('FFTW', '3.3.1')]
 osdependencies = ['libpthread.a']  # delivered by glibc-static or glibc-devel
 
 tests = [
-      # test case 1: NaCl
-         ('NaCl', '-b', '-i 3', [r'^:DIS.*0.1227', r'^:ENE.*-1248.1427']),
-      # test case 2: TiO2
-         ('TiO2',
-          '-b -numk 1000 -rkmax 7.5',
-          '-in1ef -cc 0.00001 -fc 0.5 -i 100',
-          [r'^:ENE.*-4018.0761',
-           r'^:FGL001.*\s+[0.]+\s+[0.]+\s+[0.]+\s+total forces',
-           r'^:FGL002.*14.63.*total forces'
-          ])
-        ]
+    # test case 1: NaCl
+    ('NaCl', '-b', '-i 3', [r'^:DIS.*0.1227', r'^:ENE.*-1248.1427']),
+    # test case 2: TiO2
+    ('TiO2',
+     '-b -numk 1000 -rkmax 7.5',
+     '-in1ef -cc 0.00001 -fc 0.5 -i 100',
+     [r'^:ENE.*-4018.0761',
+      r'^:FGL001.*\s+[0.]+\s+[0.]+\s+[0.]+\s+total forces',
+      r'^:FGL002.*14.63.*total forces'
+      ])
+]
 
 moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/w/WIEN2k/WIEN2k-14.1-intel-2014b.eb b/easybuild/easyconfigs/w/WIEN2k/WIEN2k-14.1-intel-2014b.eb
index 9a8f71d9ca8e939815707671b685d6e483d14fc2..d99b5a04c843c2f36b10a7e0906aa4704ead8184 100644
--- a/easybuild/easyconfigs/w/WIEN2k/WIEN2k-14.1-intel-2014b.eb
+++ b/easybuild/easyconfigs/w/WIEN2k/WIEN2k-14.1-intel-2014b.eb
@@ -37,10 +37,10 @@ tests = [
      '-b -numk 1000 -rkmax 7.5',
      '-in1ef -cc 0.00001 -fc 0.5 -i 100',
      [
-        r'^:ENE.*-4018.07',
-        r'^:FGL001.*\s+[0.]+\s+[0.]+\s+[0.]+\s+total forces',
-        r'^:FGL002.*14.63.*total forces',
-    ]),
+         r'^:ENE.*-4018.07',
+         r'^:FGL001.*\s+[0.]+\s+[0.]+\s+[0.]+\s+total forces',
+         r'^:FGL002.*14.63.*total forces',
+     ]),
 ]
 
 moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/w/WIEN2k/WIEN2k-14.1-intel-2015a.eb b/easybuild/easyconfigs/w/WIEN2k/WIEN2k-14.1-intel-2015a.eb
index a5d641a90f9785c8324c4cdf0f45a475be8ceaa8..4fc60981dc1043f393582e0b5179c2dba362188f 100644
--- a/easybuild/easyconfigs/w/WIEN2k/WIEN2k-14.1-intel-2015a.eb
+++ b/easybuild/easyconfigs/w/WIEN2k/WIEN2k-14.1-intel-2015a.eb
@@ -37,10 +37,10 @@ tests = [
      '-b -numk 1000 -rkmax 7.5',
      '-in1ef -cc 0.00001 -fc 0.5 -i 100',
      [
-        r'^:ENE.*-4018.07',
-        r'^:FGL001.*\s+[0.]+\s+[0.]+\s+[0.]+\s+total forces',
-        r'^:FGL002.*14.63.*total forces',
-    ]),
+         r'^:ENE.*-4018.07',
+         r'^:FGL001.*\s+[0.]+\s+[0.]+\s+[0.]+\s+total forces',
+         r'^:FGL002.*14.63.*total forces',
+     ]),
 ]
 
 moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/w/WIEN2k/WIEN2k-14.2-intel-2015a.eb b/easybuild/easyconfigs/w/WIEN2k/WIEN2k-14.2-intel-2015a.eb
index 5149928839f335388946ffc422ca9f1faca0e75a..2e1d5ab15d8789787de0b72fe69206240a01cb9b 100644
--- a/easybuild/easyconfigs/w/WIEN2k/WIEN2k-14.2-intel-2015a.eb
+++ b/easybuild/easyconfigs/w/WIEN2k/WIEN2k-14.2-intel-2015a.eb
@@ -31,10 +31,10 @@ tests = [
      '-b -numk 1000 -rkmax 7.5',
      '-in1ef -cc 0.00001 -fc 0.5 -i 100',
      [
-        r'^:ENE.*-4018.07',
-        r'^:FGL001.*\s+[0.]+\s+[0.]+\s+[0.]+\s+total forces',
-        r'^:FGL002.*14.63.*total forces',
-    ]),
+         r'^:ENE.*-4018.07',
+         r'^:FGL001.*\s+[0.]+\s+[0.]+\s+[0.]+\s+total forces',
+         r'^:FGL002.*14.63.*total forces',
+     ]),
 ]
 
 moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/w/WPS/WPS-3.4.1-ictce-5.3.0-dmpar.eb b/easybuild/easyconfigs/w/WPS/WPS-3.4.1-ictce-5.3.0-dmpar.eb
index 8e3d2604d54ca0803ad63734b67314dccf37942d..e43733e3f611d4be4ddff7439ec25265a5631b40 100644
--- a/easybuild/easyconfigs/w/WPS/WPS-3.4.1-ictce-5.3.0-dmpar.eb
+++ b/easybuild/easyconfigs/w/WPS/WPS-3.4.1-ictce-5.3.0-dmpar.eb
@@ -25,7 +25,7 @@ dependencies = [
     ('netCDF', '4.2.1.1'),
     ('netCDF-Fortran', '4.2'),
     ('libpng', '1.5.14'),
-    ('JasPer','1.900.1'),
+    ('JasPer', '1.900.1'),
 ]
 
 moduleclass = 'geo'
diff --git a/easybuild/easyconfigs/w/WPS/WPS-3.4.1-iqacml-3.7.3-dmpar.eb b/easybuild/easyconfigs/w/WPS/WPS-3.4.1-iqacml-3.7.3-dmpar.eb
index 7d70493e14d3adbbb850bf2b9cf1f60f207d4a13..3a831bedc4684199d9a2a8b4ae62037e4947e7e8 100644
--- a/easybuild/easyconfigs/w/WPS/WPS-3.4.1-iqacml-3.7.3-dmpar.eb
+++ b/easybuild/easyconfigs/w/WPS/WPS-3.4.1-iqacml-3.7.3-dmpar.eb
@@ -25,7 +25,7 @@ dependencies = [
     ('netCDF', '4.2.1.1'),
     ('netCDF-Fortran', '4.2'),
     ('libpng', '1.5.14'),
-    ('JasPer','1.900.1'),
+    ('JasPer', '1.900.1'),
 ]
 
 moduleclass = 'geo'
diff --git a/easybuild/easyconfigs/w/wiki2beamer/wiki2beamer-0.9.5-goalf-1.1.0-no-OFED-Python-2.7.3.eb b/easybuild/easyconfigs/w/wiki2beamer/wiki2beamer-0.9.5-goalf-1.1.0-no-OFED-Python-2.7.3.eb
index 12cf06119f38e643a72c8be982b8d0ab0b66e529..e43780a277b7fb931bb5e4ee1bf1ec45f3ff94fa 100644
--- a/easybuild/easyconfigs/w/wiki2beamer/wiki2beamer-0.9.5-goalf-1.1.0-no-OFED-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/w/wiki2beamer/wiki2beamer-0.9.5-goalf-1.1.0-no-OFED-Python-2.7.3.eb
@@ -22,9 +22,8 @@ description = """wiki2beamer converts a simple wiki-like syntax to complex LaTeX
 
 toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
 
-# eg. http://sourceforge.net/projects/wiki2beamer/files/wiki2beamer/wiki2beamer-0.9.5/wiki2beamer-0.9.5.zip/download
-sources = ['wiki2beamer-0.9.5.zip']
-source_urls = ['http://sourceforge.net/projects/wiki2beamer/files/wiki2beamer/wiki2beamer-0.9.5','download']
+sources = ['wiki2beamer-%(version)s.zip']
+source_urls = ['http://sourceforge.net/projects/wiki2beamer/files/wiki2beamer/wiki2beamer-%(version)s', 'download']
 
 python = 'Python'
 pyver = '2.7.3'
@@ -37,8 +36,8 @@ start_dir = 'code'
 options = {'modulename': False}
 
 sanity_check_paths = {
-                      'files': ["bin/wiki2beamer"],
-                      'dirs': ["."]
-                     }
+    'files': ["bin/wiki2beamer"],
+    'dirs': ["."]
+}
 
 moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/w/wiki2beamer/wiki2beamer-0.9.5-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/w/wiki2beamer/wiki2beamer-0.9.5-goolf-1.4.10-Python-2.7.3.eb
index e59097b639d201a327e3894e8087030163f22161..71553532b149b6ea24016f6b76131a29699c0882 100644
--- a/easybuild/easyconfigs/w/wiki2beamer/wiki2beamer-0.9.5-goolf-1.4.10-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/w/wiki2beamer/wiki2beamer-0.9.5-goolf-1.4.10-Python-2.7.3.eb
@@ -22,9 +22,8 @@ description = """wiki2beamer converts a simple wiki-like syntax to complex LaTeX
 
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 
-# eg. http://sourceforge.net/projects/wiki2beamer/files/wiki2beamer/wiki2beamer-0.9.5/wiki2beamer-0.9.5.zip/download
-sources = ['wiki2beamer-0.9.5.zip']
-source_urls = ['http://sourceforge.net/projects/wiki2beamer/files/wiki2beamer/wiki2beamer-0.9.5','download']
+sources = ['wiki2beamer-%(version)s.zip']
+source_urls = ['http://sourceforge.net/projects/wiki2beamer/files/wiki2beamer/wiki2beamer-%(version)s', 'download']
 
 python = 'Python'
 pyver = '2.7.3'
diff --git a/easybuild/easyconfigs/w/wiki2beamer/wiki2beamer-0.9.5-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/w/wiki2beamer/wiki2beamer-0.9.5-ictce-5.3.0-Python-2.7.3.eb
index 37b9d91c99588a309542d2d6f42f0288fc1a8935..b2e2623f1fc8cb6e0f85d2ca467492f68dc54c2f 100644
--- a/easybuild/easyconfigs/w/wiki2beamer/wiki2beamer-0.9.5-ictce-5.3.0-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/w/wiki2beamer/wiki2beamer-0.9.5-ictce-5.3.0-Python-2.7.3.eb
@@ -22,9 +22,8 @@ description = """wiki2beamer converts a simple wiki-like syntax to complex LaTeX
 
 toolchain = {'name': 'ictce', 'version': '5.3.0'}
 
-# eg. http://sourceforge.net/projects/wiki2beamer/files/wiki2beamer/wiki2beamer-0.9.5/wiki2beamer-0.9.5.zip/download
-sources = ['wiki2beamer-0.9.5.zip']
-source_urls = ['http://sourceforge.net/projects/wiki2beamer/files/wiki2beamer/wiki2beamer-0.9.5','download']
+sources = ['wiki2beamer-%(version)s.zip']
+source_urls = ['http://sourceforge.net/projects/wiki2beamer/files/wiki2beamer/wiki2beamer-%(version)s', 'download']
 
 python = 'Python'
 pyver = '2.7.3'
@@ -37,8 +36,8 @@ start_dir = 'code'
 options = {'modulename': False}
 
 sanity_check_paths = {
-                      'files': ["bin/wiki2beamer"],
-                      'dirs': ["."]
-                     }
+    'files': ["bin/wiki2beamer"],
+    'dirs': ["."]
+}
 
 moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/x/XCrySDen/XCrySDen-1.5.53-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/x/XCrySDen/XCrySDen-1.5.53-goalf-1.1.0-no-OFED.eb
index a68cdcecf89cf2a9df3fe0eef68342d3c1b62e96..29c6323d63f788f1e11c836a434c263490548afe 100644
--- a/easybuild/easyconfigs/x/XCrySDen/XCrySDen-1.5.53-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/x/XCrySDen/XCrySDen-1.5.53-goalf-1.1.0-no-OFED.eb
@@ -16,10 +16,10 @@ patches = ['XCrySDen_no-bwidget.patch']
 
 tcltk_ver = '8.5.12'
 dependencies = [
-                ('Tcl', tcltk_ver),
-                ('Tk', tcltk_ver),
-                ('Mesa', '7.11.2', '-Python-2.7.3'),
-               ]
+    ('Tcl', tcltk_ver),
+    ('Tk', tcltk_ver),
+    ('Mesa', '7.11.2', '-Python-2.7.3'),
+]
 
 osdependencies = ['libXmu-devel']
 
diff --git a/easybuild/easyconfigs/x/XCrySDen/XCrySDen-1.5.53-ictce-4.0.6.eb b/easybuild/easyconfigs/x/XCrySDen/XCrySDen-1.5.53-ictce-4.0.6.eb
index 75e7ae09d81fd9034fb735832255020969c4411e..bba359b7d71faee8909844b79504d676d20608b7 100644
--- a/easybuild/easyconfigs/x/XCrySDen/XCrySDen-1.5.53-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/x/XCrySDen/XCrySDen-1.5.53-ictce-4.0.6.eb
@@ -15,10 +15,10 @@ patches = ['XCrySDen_no-bwidget.patch']
 
 tcltk_ver = '8.5.12'
 dependencies = [
-                ('Tcl', tcltk_ver),
-                ('Tk', tcltk_ver),
-                ('Mesa', '7.11.2', '-Python-2.7.3'),
-               ]
+    ('Tcl', tcltk_ver),
+    ('Tk', tcltk_ver),
+    ('Mesa', '7.11.2', '-Python-2.7.3'),
+]
 
 osdependencies = ['libXmu-devel']
 
diff --git a/easybuild/easyconfigs/x/XCrySDen/XCrySDen-1.5.53-ictce-5.3.0.eb b/easybuild/easyconfigs/x/XCrySDen/XCrySDen-1.5.53-ictce-5.3.0.eb
index 6c009ea47a8a729e2f0cc52b9dd52506dbec877d..a6b6321356c07fbc2a3e45078dbc5d0f5fb26caf 100644
--- a/easybuild/easyconfigs/x/XCrySDen/XCrySDen-1.5.53-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/x/XCrySDen/XCrySDen-1.5.53-ictce-5.3.0.eb
@@ -16,10 +16,10 @@ patches = ['XCrySDen_no-bwidget.patch']
 
 tcltk_ver = '8.5.12'
 dependencies = [
-                ('Tcl', tcltk_ver),
-                ('Tk', tcltk_ver),
-                ('Mesa', '7.11.2', '-Python-2.7.3'),
-               ]
+    ('Tcl', tcltk_ver),
+    ('Tk', tcltk_ver),
+    ('Mesa', '7.11.2', '-Python-2.7.3'),
+]
 
 osdependencies = ['libXmu-devel']
 
diff --git a/easybuild/easyconfigs/x/XKeyboardConfig/XKeyboardConfig-2.16-intel-2015b-Python-2.7.11.eb b/easybuild/easyconfigs/x/XKeyboardConfig/XKeyboardConfig-2.16-intel-2015b-Python-2.7.11.eb
index 6a5ccd4d2e3b7fa3737bc84dccb413c7c12a2884..313bc69227176863635b779200a36aa6deeff6a1 100644
--- a/easybuild/easyconfigs/x/XKeyboardConfig/XKeyboardConfig-2.16-intel-2015b-Python-2.7.11.eb
+++ b/easybuild/easyconfigs/x/XKeyboardConfig/XKeyboardConfig-2.16-intel-2015b-Python-2.7.11.eb
@@ -13,7 +13,7 @@ description = """The non-arch keyboard configuration database for X Window.
 
 toolchain = {'name': 'intel', 'version': '2015b'}
 
-source_urls  = ['http://ftp.x.org/pub/individual/data/xkeyboard-config/']
+source_urls = ['http://ftp.x.org/pub/individual/data/xkeyboard-config/']
 sources = ['xkeyboard-config-%(version)s.tar.bz2']
 
 builddependencies = [
@@ -26,7 +26,7 @@ dependencies = [
     ('libX11', '1.6.3', '-Python-2.7.11'),
 ]
 
-#see http://www.linuxfromscratch.org/blfs/view/svn/x/xkeyboard-config.html
+# see http://www.linuxfromscratch.org/blfs/view/svn/x/xkeyboard-config.html
 configopts = '--with-xkb-rules-symlink=xorg '
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/x/XKeyboardConfig/XKeyboardConfig-2.16-intel-2015b.eb b/easybuild/easyconfigs/x/XKeyboardConfig/XKeyboardConfig-2.16-intel-2015b.eb
index 2f437613fcdd0ea2d9bc69a446dfb7c8b1e84c4b..713916a02a8f1f078d1ccc357c2337f2abd0afd6 100644
--- a/easybuild/easyconfigs/x/XKeyboardConfig/XKeyboardConfig-2.16-intel-2015b.eb
+++ b/easybuild/easyconfigs/x/XKeyboardConfig/XKeyboardConfig-2.16-intel-2015b.eb
@@ -12,7 +12,7 @@ description = """The non-arch keyboard configuration database for X Window.
 
 toolchain = {'name': 'intel', 'version': '2015b'}
 
-source_urls  = ['http://ftp.x.org/pub/individual/data/xkeyboard-config/']
+source_urls = ['http://ftp.x.org/pub/individual/data/xkeyboard-config/']
 sources = ['xkeyboard-config-%(version)s.tar.bz2']
 
 builddependencies = [
@@ -25,7 +25,7 @@ dependencies = [
     ('libX11', '1.6.3', '-Python-2.7.10'),
 ]
 
-#see http://www.linuxfromscratch.org/blfs/view/svn/x/xkeyboard-config.html
+# see http://www.linuxfromscratch.org/blfs/view/svn/x/xkeyboard-config.html
 configopts = '--with-xkb-rules-symlink=xorg '
 
 sanity_check_paths = {
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 d9881b2ef718a5421ee1061303bfb7e37c76d838..ec08bd48fa2909fcf3d677c2092420df96f2b746 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
@@ -4,7 +4,7 @@ versionsuffix = '-with-incl-deps'
 
 homepage = 'http://xmipp.cnb.csic.es/'
 description = "Xmipp is a suite of image processing programs, primarily aimed at single-particle 3D electron microscopy."
- 
+
 source_urls = ['http://xmipp.cnb.csic.es/Downloads/']
 sources = ['Xmipp-%(version)s-src.tar.gz']
 
diff --git a/easybuild/easyconfigs/x/x264/x264-20160114-foss-2015a.eb b/easybuild/easyconfigs/x/x264/x264-20160114-foss-2015a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..eddd9ff8e0db7127a3b1f6c4996a132ceec71e44
--- /dev/null
+++ b/easybuild/easyconfigs/x/x264/x264-20160114-foss-2015a.eb
@@ -0,0 +1,24 @@
+easyblock = 'ConfigureMake'
+
+name = 'x264'
+version = '20160114'
+
+homepage = 'http://www.videolan.org/developers/x264.html'
+description = """x264 is a free software library and application for encoding video streams into the H.264/MPEG-4
+ AVC compression format, and is released under the terms of the GNU GPL."""
+
+toolchain = {'name': 'foss', 'version': '2015a'}
+
+source_urls = ['ftp://ftp.videolan.org/pub/videolan/x264/snapshots/']
+sources = ['x264-snapshot-%(version)s-2245-stable.tar.bz2']
+
+dependencies = [('Yasm', '1.3.0')]
+
+configopts = "  --enable-shared --enable-static "
+
+sanity_check_paths = {
+    'files': ['bin/x264', 'include/x264_config.h', 'include/x264.h', 'lib/libx264.a', 'lib/libx264.%s' % SHLIB_EXT],
+    'dirs': [],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/x/x264/x264-20160114-gimkl-2.11.5.eb b/easybuild/easyconfigs/x/x264/x264-20160114-gimkl-2.11.5.eb
new file mode 100644
index 0000000000000000000000000000000000000000..c6c378ce92d3d372322a1c9fb5900a80e5936f71
--- /dev/null
+++ b/easybuild/easyconfigs/x/x264/x264-20160114-gimkl-2.11.5.eb
@@ -0,0 +1,24 @@
+easyblock = 'ConfigureMake'
+
+name = 'x264'
+version = '20160114'
+
+homepage = 'http://www.videolan.org/developers/x264.html'
+description = """x264 is a free software library and application for encoding video streams into the H.264/MPEG-4
+ AVC compression format, and is released under the terms of the GNU GPL."""
+
+toolchain = {'name': 'gimkl', 'version': '2.11.5'}
+
+source_urls = ['ftp://ftp.videolan.org/pub/videolan/x264/snapshots/']
+sources = ['x264-snapshot-%(version)s-2245-stable.tar.bz2']
+
+dependencies = [('Yasm', '1.3.0')]
+
+configopts = "  --enable-shared --enable-static "
+
+sanity_check_paths = {
+    'files': ['bin/x264', 'include/x264_config.h', 'include/x264.h', 'lib/libx264.a', 'lib/libx264.%s' % SHLIB_EXT],
+    'dirs': [],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/x/x264/x264-20160114-intel-2016a.eb b/easybuild/easyconfigs/x/x264/x264-20160114-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..9937ee8cc3927678c8d1ed2b45d8310504a5d1e6
--- /dev/null
+++ b/easybuild/easyconfigs/x/x264/x264-20160114-intel-2016a.eb
@@ -0,0 +1,24 @@
+easyblock = 'ConfigureMake'
+
+name = 'x264'
+version = '20160114'
+
+homepage = 'http://www.videolan.org/developers/x264.html'
+description = """x264 is a free software library and application for encoding video streams into the H.264/MPEG-4
+ AVC compression format, and is released under the terms of the GNU GPL."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+source_urls = ['ftp://ftp.videolan.org/pub/videolan/x264/snapshots/']
+sources = ['x264-snapshot-%(version)s-2245-stable.tar.bz2']
+
+dependencies = [('Yasm', '1.3.0')]
+
+configopts = "  --enable-shared --enable-static "
+
+sanity_check_paths = {
+    'files': ['bin/x264', 'include/x264_config.h', 'include/x264.h', 'lib/libx264.a', 'lib/libx264.%s' % SHLIB_EXT],
+    'dirs': [],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/x/xbitmaps/xbitmaps-1.1.1-goolf-1.4.10.eb b/easybuild/easyconfigs/x/xbitmaps/xbitmaps-1.1.1-goolf-1.4.10.eb
index f4bfeba75e91c2231bd0df4fe33632e1f586505c..93be023dae5acb990f1116586c4b3e644e8ef91f 100644
--- a/easybuild/easyconfigs/x/xbitmaps/xbitmaps-1.1.1-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/x/xbitmaps/xbitmaps-1.1.1-goolf-1.4.10.eb
@@ -12,8 +12,8 @@ sources = [SOURCE_TAR_GZ]
 source_urls = ['http://xorg.freedesktop.org/archive/individual/data/']
 
 sanity_check_paths = {
-    'files' : ['include/X11/bitmaps/gray'],
-    'dirs' : []
+    'files': ['include/X11/bitmaps/gray'],
+    'dirs': []
 }
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/x/xbitmaps/xbitmaps-1.1.1-ictce-4.1.13.eb b/easybuild/easyconfigs/x/xbitmaps/xbitmaps-1.1.1-ictce-4.1.13.eb
index 73f42d47356da6d241c436eb540a9ee8508e8087..7edd725bb85748d08f67bef901f55353d1bbb4d0 100644
--- a/easybuild/easyconfigs/x/xbitmaps/xbitmaps-1.1.1-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/x/xbitmaps/xbitmaps-1.1.1-ictce-4.1.13.eb
@@ -11,8 +11,8 @@ sources = [SOURCE_TAR_GZ]
 source_urls = ['http://xorg.freedesktop.org/archive/individual/data/']
 
 sanity_check_paths = {
-    'files' : ['include/X11/bitmaps/gray'],
-    'dirs' : []
+    'files': ['include/X11/bitmaps/gray'],
+    'dirs': []
 }
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/x/xbitmaps/xbitmaps-1.1.1-ictce-5.3.0.eb b/easybuild/easyconfigs/x/xbitmaps/xbitmaps-1.1.1-ictce-5.3.0.eb
index 524c55782bd35a1230e9c7ca42cf680d8d7a462c..38732656c2e7860489961b858ce3088ee9708a01 100644
--- a/easybuild/easyconfigs/x/xbitmaps/xbitmaps-1.1.1-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/x/xbitmaps/xbitmaps-1.1.1-ictce-5.3.0.eb
@@ -12,8 +12,8 @@ sources = [SOURCE_TAR_GZ]
 source_urls = ['http://xorg.freedesktop.org/archive/individual/data/']
 
 sanity_check_paths = {
-    'files' : ['include/X11/bitmaps/gray'],
-    'dirs' : []
+    'files': ['include/X11/bitmaps/gray'],
+    'dirs': []
 }
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/x/xbitmaps/xbitmaps-1.1.1-intel-2014b.eb b/easybuild/easyconfigs/x/xbitmaps/xbitmaps-1.1.1-intel-2014b.eb
index e352b3479dcbb5f014e695005297ea880686c9a3..f7d2e42a4b41edbb23fc3664382a815cb5abd3e0 100644
--- a/easybuild/easyconfigs/x/xbitmaps/xbitmaps-1.1.1-intel-2014b.eb
+++ b/easybuild/easyconfigs/x/xbitmaps/xbitmaps-1.1.1-intel-2014b.eb
@@ -12,8 +12,8 @@ sources = [SOURCE_TAR_GZ]
 source_urls = ['http://xorg.freedesktop.org/archive/individual/data/']
 
 sanity_check_paths = {
-    'files' : ['include/X11/bitmaps/gray'],
-    'dirs' : []
+    'files': ['include/X11/bitmaps/gray'],
+    'dirs': []
 }
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/x/xbitmaps/xbitmaps-1.1.1-intel-2015a.eb b/easybuild/easyconfigs/x/xbitmaps/xbitmaps-1.1.1-intel-2015a.eb
index 159e636639b246048dd97fed9ed755c8e0815588..7c6cc82582a5bef0b2209fe49d78f789905b7d6a 100644
--- a/easybuild/easyconfigs/x/xbitmaps/xbitmaps-1.1.1-intel-2015a.eb
+++ b/easybuild/easyconfigs/x/xbitmaps/xbitmaps-1.1.1-intel-2015a.eb
@@ -12,8 +12,8 @@ sources = [SOURCE_TAR_GZ]
 source_urls = ['http://xorg.freedesktop.org/archive/individual/data/']
 
 sanity_check_paths = {
-    'files' : ['include/X11/bitmaps/gray'],
-    'dirs' : []
+    'files': ['include/X11/bitmaps/gray'],
+    'dirs': []
 }
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/x/xcb-proto/xcb-proto-1.10-foss-2014b-Python-2.7.8.eb b/easybuild/easyconfigs/x/xcb-proto/xcb-proto-1.10-foss-2014b-Python-2.7.8.eb
index ffd671773501cb9c70f46b9547ea0defdbc8b647..56c11b1259bdfbbc99f458cc60630bd1521cd3f2 100644
--- a/easybuild/easyconfigs/x/xcb-proto/xcb-proto-1.10-foss-2014b-Python-2.7.8.eb
+++ b/easybuild/easyconfigs/x/xcb-proto/xcb-proto-1.10-foss-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."""
 
-source_urls  = ['http://xcb.freedesktop.org/dist/']
+source_urls = ['http://xcb.freedesktop.org/dist/']
 sources = [SOURCELOWER_TAR_GZ]
 
 toolchain = {'name': 'foss', 'version': '2014b'}
diff --git a/easybuild/easyconfigs/x/xcb-proto/xcb-proto-1.10-intel-2014b-Python-2.7.8.eb b/easybuild/easyconfigs/x/xcb-proto/xcb-proto-1.10-intel-2014b-Python-2.7.8.eb
index 1f1ee49c72485f77f468df66dafabf8bd7827eba..4e713d1007106bf508a99abf908b0abe8af61acd 100644
--- a/easybuild/easyconfigs/x/xcb-proto/xcb-proto-1.10-intel-2014b-Python-2.7.8.eb
+++ b/easybuild/easyconfigs/x/xcb-proto/xcb-proto-1.10-intel-2014b-Python-2.7.8.eb
@@ -9,7 +9,7 @@ latency hiding, direct access to the protocol, improved threading support, and e
 
 toolchain = {'name': 'intel', 'version': '2014b'}
 
-source_urls  = ['http://xcb.freedesktop.org/dist/']
+source_urls = ['http://xcb.freedesktop.org/dist/']
 sources = [SOURCELOWER_TAR_GZ]
 
 python = 'Python'
diff --git a/easybuild/easyconfigs/x/xcb-proto/xcb-proto-1.11-goolf-1.5.14-Python-2.7.9.eb b/easybuild/easyconfigs/x/xcb-proto/xcb-proto-1.11-goolf-1.5.14-Python-2.7.9.eb
index 5321244281580227d68daaf7fa64b8ba1f2a05ae..5aabb670ddf18db5ce36cc9f96392d78e7fbc23d 100644
--- a/easybuild/easyconfigs/x/xcb-proto/xcb-proto-1.11-goolf-1.5.14-Python-2.7.9.eb
+++ b/easybuild/easyconfigs/x/xcb-proto/xcb-proto-1.11-goolf-1.5.14-Python-2.7.9.eb
@@ -9,7 +9,7 @@ description = """The X protocol C-language Binding (XCB) is a replacement for Xl
 
 toolchain = {'name': 'goolf', 'version': '1.5.14'}
 
-source_urls  = ['http://xcb.freedesktop.org/dist/']
+source_urls = ['http://xcb.freedesktop.org/dist/']
 sources = [SOURCELOWER_TAR_GZ]
 
 python = 'Python'
diff --git a/easybuild/easyconfigs/x/xcb-proto/xcb-proto-1.11-intel-2015a-Python-2.7.10.eb b/easybuild/easyconfigs/x/xcb-proto/xcb-proto-1.11-intel-2015a-Python-2.7.10.eb
index 32ea56a932f28900507c4dd9c2a1cc7e6e9677e9..d27f91cf2b03d984b4b3855acc00f8a9c7313a27 100644
--- a/easybuild/easyconfigs/x/xcb-proto/xcb-proto-1.11-intel-2015a-Python-2.7.10.eb
+++ b/easybuild/easyconfigs/x/xcb-proto/xcb-proto-1.11-intel-2015a-Python-2.7.10.eb
@@ -9,7 +9,7 @@ latency hiding, direct access to the protocol, improved threading support, and e
 
 toolchain = {'name': 'intel', 'version': '2015a'}
 
-source_urls  = ['http://xcb.freedesktop.org/dist/']
+source_urls = ['http://xcb.freedesktop.org/dist/']
 sources = [SOURCELOWER_TAR_GZ]
 
 python = 'Python'
diff --git a/easybuild/easyconfigs/x/xcb-proto/xcb-proto-1.11-intel-2015a-Python-2.7.9.eb b/easybuild/easyconfigs/x/xcb-proto/xcb-proto-1.11-intel-2015a-Python-2.7.9.eb
index 38f0fd5a8856e13e61a0ea7f9a9e3345e6e4ea16..7dd5fbf8e32816e58fdcb4205e0941f22a22a4ac 100644
--- a/easybuild/easyconfigs/x/xcb-proto/xcb-proto-1.11-intel-2015a-Python-2.7.9.eb
+++ b/easybuild/easyconfigs/x/xcb-proto/xcb-proto-1.11-intel-2015a-Python-2.7.9.eb
@@ -9,7 +9,7 @@ latency hiding, direct access to the protocol, improved threading support, and e
 
 toolchain = {'name': 'intel', 'version': '2015a'}
 
-source_urls  = ['http://xcb.freedesktop.org/dist/']
+source_urls = ['http://xcb.freedesktop.org/dist/']
 sources = [SOURCELOWER_TAR_GZ]
 
 python = 'Python'
diff --git a/easybuild/easyconfigs/x/xcb-proto/xcb-proto-1.11-intel-2015b-Python-2.7.10.eb b/easybuild/easyconfigs/x/xcb-proto/xcb-proto-1.11-intel-2015b-Python-2.7.10.eb
index a52aa643f5f7b9228e1457b7b799b6a78a534223..be9444a25e308352697634d2115a70cb4bd22ef8 100644
--- a/easybuild/easyconfigs/x/xcb-proto/xcb-proto-1.11-intel-2015b-Python-2.7.10.eb
+++ b/easybuild/easyconfigs/x/xcb-proto/xcb-proto-1.11-intel-2015b-Python-2.7.10.eb
@@ -9,7 +9,7 @@ latency hiding, direct access to the protocol, improved threading support, and e
 
 toolchain = {'name': 'intel', 'version': '2015b'}
 
-source_urls  = ['http://xcb.freedesktop.org/dist/']
+source_urls = ['http://xcb.freedesktop.org/dist/']
 sources = [SOURCELOWER_TAR_GZ]
 
 python = 'Python'
diff --git a/easybuild/easyconfigs/x/xcb-proto/xcb-proto-1.11-intel-2015b-Python-2.7.11.eb b/easybuild/easyconfigs/x/xcb-proto/xcb-proto-1.11-intel-2015b-Python-2.7.11.eb
index 750bbbc4cd302d1a241855f2f29253fce684c4ab..47d245e6decd396923601b531681a0ac0afc0635 100644
--- a/easybuild/easyconfigs/x/xcb-proto/xcb-proto-1.11-intel-2015b-Python-2.7.11.eb
+++ b/easybuild/easyconfigs/x/xcb-proto/xcb-proto-1.11-intel-2015b-Python-2.7.11.eb
@@ -9,7 +9,7 @@ latency hiding, direct access to the protocol, improved threading support, and e
 
 toolchain = {'name': 'intel', 'version': '2015b'}
 
-source_urls  = ['http://xcb.freedesktop.org/dist/']
+source_urls = ['http://xcb.freedesktop.org/dist/']
 sources = [SOURCELOWER_TAR_GZ]
 
 python = 'Python'
diff --git a/easybuild/easyconfigs/x/xcb-proto/xcb-proto-1.7-goalf-1.1.0-no-OFED-Python-2.7.3.eb b/easybuild/easyconfigs/x/xcb-proto/xcb-proto-1.7-goalf-1.1.0-no-OFED-Python-2.7.3.eb
index 01ca8890f378e03123ae8f4370f676270464a575..6664f94fac8256657c7bb2fedaf9bd370429cd0c 100644
--- a/easybuild/easyconfigs/x/xcb-proto/xcb-proto-1.7-goalf-1.1.0-no-OFED-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/x/xcb-proto/xcb-proto-1.7-goalf-1.1.0-no-OFED-Python-2.7.3.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."""
 
-source_urls  = ['http://xcb.freedesktop.org/dist/']
+source_urls = ['http://xcb.freedesktop.org/dist/']
 sources = [SOURCELOWER_TAR_GZ]
 
 toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
@@ -20,8 +20,8 @@ dependencies = [(python, pyver)]
 pyshortver = '.'.join(pyver.split('.')[0:2])
 
 sanity_check_paths = {
-                      'files': ['lib/pkgconfig/xcb-proto.pc'],
-                      'dirs': ['lib/python%s/site-packages/xcbgen' % pyshortver]
-                     }
+    'files': ['lib/pkgconfig/xcb-proto.pc'],
+    'dirs': ['lib/python%s/site-packages/xcbgen' % pyshortver]
+}
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/x/xcb-proto/xcb-proto-1.7-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/x/xcb-proto/xcb-proto-1.7-goolf-1.4.10-Python-2.7.3.eb
index 49ac560a5ba0ed2ccba478d5d94546ec464e2771..0d23ddbe58668101cab04f1c2e920e75430957f1 100644
--- a/easybuild/easyconfigs/x/xcb-proto/xcb-proto-1.7-goolf-1.4.10-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/x/xcb-proto/xcb-proto-1.7-goolf-1.4.10-Python-2.7.3.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."""
 
-source_urls  = ['http://xcb.freedesktop.org/dist/']
+source_urls = ['http://xcb.freedesktop.org/dist/']
 sources = [SOURCELOWER_TAR_GZ]
 
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
diff --git a/easybuild/easyconfigs/x/xcb-proto/xcb-proto-1.7-goolf-1.5.14-Python-2.7.3.eb b/easybuild/easyconfigs/x/xcb-proto/xcb-proto-1.7-goolf-1.5.14-Python-2.7.3.eb
index ba3ec86dfdb58f6637e6a84c83eb45e7b6219993..da6b2762c10a89434d77e9a553b67a3213257f4f 100644
--- a/easybuild/easyconfigs/x/xcb-proto/xcb-proto-1.7-goolf-1.5.14-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/x/xcb-proto/xcb-proto-1.7-goolf-1.5.14-Python-2.7.3.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."""
 
-source_urls  = ['http://xcb.freedesktop.org/dist/']
+source_urls = ['http://xcb.freedesktop.org/dist/']
 sources = [SOURCELOWER_TAR_GZ]
 
 toolchain = {'name': 'goolf', 'version': '1.5.14'}
diff --git a/easybuild/easyconfigs/x/xcb-proto/xcb-proto-1.7-ictce-4.0.6-Python-2.7.3.eb b/easybuild/easyconfigs/x/xcb-proto/xcb-proto-1.7-ictce-4.0.6-Python-2.7.3.eb
index fb6b5dd346151ac734d310741a5e578b579e2890..2af6f49473bbaf22169ad50e8980fe708659d3ab 100644
--- a/easybuild/easyconfigs/x/xcb-proto/xcb-proto-1.7-ictce-4.0.6-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/x/xcb-proto/xcb-proto-1.7-ictce-4.0.6-Python-2.7.3.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."""
 
-source_urls  = ['http://xcb.freedesktop.org/dist/']
+source_urls = ['http://xcb.freedesktop.org/dist/']
 sources = [SOURCELOWER_TAR_GZ]
 
 toolchain = {'name': 'ictce', 'version': '4.0.6'}
@@ -20,8 +20,8 @@ dependencies = [(python, pyver)]
 pyshortver = '.'.join(pyver.split('.')[0:2])
 
 sanity_check_paths = {
-                      'files': ['lib/pkgconfig/xcb-proto.pc'],
-                      'dirs': ['lib/python%s/site-packages/xcbgen' % pyshortver]
-                     }
+    'files': ['lib/pkgconfig/xcb-proto.pc'],
+    'dirs': ['lib/python%s/site-packages/xcbgen' % pyshortver]
+}
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/x/xcb-proto/xcb-proto-1.7-ictce-4.1.13-Python-2.7.3.eb b/easybuild/easyconfigs/x/xcb-proto/xcb-proto-1.7-ictce-4.1.13-Python-2.7.3.eb
index 673f729a0bb021255679d9fee9fbbcb430e07e9f..6bd488684da315fd6c34070bd730e8850ab9a937 100644
--- a/easybuild/easyconfigs/x/xcb-proto/xcb-proto-1.7-ictce-4.1.13-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/x/xcb-proto/xcb-proto-1.7-ictce-4.1.13-Python-2.7.3.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."""
 
-source_urls  = ['http://xcb.freedesktop.org/dist/']
+source_urls = ['http://xcb.freedesktop.org/dist/']
 sources = [SOURCELOWER_TAR_GZ]
 
 toolchain = {'name': 'ictce', 'version': '4.1.13'}
diff --git a/easybuild/easyconfigs/x/xcb-proto/xcb-proto-1.7-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/x/xcb-proto/xcb-proto-1.7-ictce-5.3.0-Python-2.7.3.eb
index 153a7de4965e83196cf7bb125858d317aad8285f..d0f7ea41599762b0b3803ac151b23435da2986eb 100644
--- a/easybuild/easyconfigs/x/xcb-proto/xcb-proto-1.7-ictce-5.3.0-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/x/xcb-proto/xcb-proto-1.7-ictce-5.3.0-Python-2.7.3.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."""
 
-source_urls  = ['http://xcb.freedesktop.org/dist/']
+source_urls = ['http://xcb.freedesktop.org/dist/']
 sources = [SOURCELOWER_TAR_GZ]
 
 
@@ -21,8 +21,8 @@ dependencies = [(python, pyver)]
 pyshortver = '.'.join(pyver.split('.')[0:2])
 
 sanity_check_paths = {
-                      'files': ['lib/pkgconfig/xcb-proto.pc'],
-                      'dirs': ['lib/python%s/site-packages/xcbgen' % pyshortver]
-                     }
+    'files': ['lib/pkgconfig/xcb-proto.pc'],
+    'dirs': ['lib/python%s/site-packages/xcbgen' % pyshortver]
+}
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/x/xcb-proto/xcb-proto-1.7-intel-2014b-Python-2.7.8.eb b/easybuild/easyconfigs/x/xcb-proto/xcb-proto-1.7-intel-2014b-Python-2.7.8.eb
index e1af44f5690a4d164cb4534e4c60cb298d4462be..d4f3a149dfeafe56c5df3a1ba6791422484d9d89 100644
--- a/easybuild/easyconfigs/x/xcb-proto/xcb-proto-1.7-intel-2014b-Python-2.7.8.eb
+++ b/easybuild/easyconfigs/x/xcb-proto/xcb-proto-1.7-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."""
 
-source_urls  = ['http://xcb.freedesktop.org/dist/']
+source_urls = ['http://xcb.freedesktop.org/dist/']
 sources = [SOURCELOWER_TAR_GZ]
 
 toolchain = {'name': 'intel', 'version': '2014b'}
diff --git a/easybuild/easyconfigs/x/xcb-util-image/xcb-util-image-0.4.0-intel-2015b-Python-2.7.11.eb b/easybuild/easyconfigs/x/xcb-util-image/xcb-util-image-0.4.0-intel-2015b-Python-2.7.11.eb
index 360cb404a5e088b83c24bbbd77bb770e47f0b82e..83c4d8a05be82e19516fb47291787d3310b4dcc5 100644
--- a/easybuild/easyconfigs/x/xcb-util-image/xcb-util-image-0.4.0-intel-2015b-Python-2.7.11.eb
+++ b/easybuild/easyconfigs/x/xcb-util-image/xcb-util-image-0.4.0-intel-2015b-Python-2.7.11.eb
@@ -9,7 +9,7 @@ description = """The xcb-util-image package provides additional extensions to th
 
 toolchain = {'name': 'intel', 'version': '2015b'}
 
-source_urls  = ['http://xcb.freedesktop.org/dist/']
+source_urls = ['http://xcb.freedesktop.org/dist/']
 sources = [SOURCELOWER_TAR_GZ]
 
 dependencies = [
diff --git a/easybuild/easyconfigs/x/xcb-util-image/xcb-util-image-0.4.0-intel-2015b.eb b/easybuild/easyconfigs/x/xcb-util-image/xcb-util-image-0.4.0-intel-2015b.eb
index 4f85a1627f8a24bcc92aef25237337e6d2f6133d..933c8b66d87f6dda094f191b46cceab045807c93 100644
--- a/easybuild/easyconfigs/x/xcb-util-image/xcb-util-image-0.4.0-intel-2015b.eb
+++ b/easybuild/easyconfigs/x/xcb-util-image/xcb-util-image-0.4.0-intel-2015b.eb
@@ -8,7 +8,7 @@ description = """The xcb-util-image package provides additional extensions to th
 
 toolchain = {'name': 'intel', 'version': '2015b'}
 
-source_urls  = ['http://xcb.freedesktop.org/dist/']
+source_urls = ['http://xcb.freedesktop.org/dist/']
 sources = [SOURCELOWER_TAR_GZ]
 
 dependencies = [
diff --git a/easybuild/easyconfigs/x/xcb-util-keysyms/xcb-util-keysyms-0.4.0-intel-2015b-Python-2.7.11.eb b/easybuild/easyconfigs/x/xcb-util-keysyms/xcb-util-keysyms-0.4.0-intel-2015b-Python-2.7.11.eb
index 2fb24a70136c5b5a754abcb1eab36fb1f5cc67bb..8a78eed4007b40e3e367340c58df9b43391d3f01 100644
--- a/easybuild/easyconfigs/x/xcb-util-keysyms/xcb-util-keysyms-0.4.0-intel-2015b-Python-2.7.11.eb
+++ b/easybuild/easyconfigs/x/xcb-util-keysyms/xcb-util-keysyms-0.4.0-intel-2015b-Python-2.7.11.eb
@@ -10,7 +10,7 @@ description = """The xcb-util-keysyms package contains a library for
 
 toolchain = {'name': 'intel', 'version': '2015b'}
 
-source_urls  = ['http://xcb.freedesktop.org/dist/']
+source_urls = ['http://xcb.freedesktop.org/dist/']
 sources = [SOURCELOWER_TAR_GZ]
 
 dependencies = [
diff --git a/easybuild/easyconfigs/x/xcb-util-keysyms/xcb-util-keysyms-0.4.0-intel-2015b.eb b/easybuild/easyconfigs/x/xcb-util-keysyms/xcb-util-keysyms-0.4.0-intel-2015b.eb
index 4854d896a133df753e9f476760d306b38becebdc..72d3c0d7bc167b7f64448dfaf7ec7ca011f392d6 100644
--- a/easybuild/easyconfigs/x/xcb-util-keysyms/xcb-util-keysyms-0.4.0-intel-2015b.eb
+++ b/easybuild/easyconfigs/x/xcb-util-keysyms/xcb-util-keysyms-0.4.0-intel-2015b.eb
@@ -9,7 +9,7 @@ description = """The xcb-util-keysyms package contains a library for
 
 toolchain = {'name': 'intel', 'version': '2015b'}
 
-source_urls  = ['http://xcb.freedesktop.org/dist/']
+source_urls = ['http://xcb.freedesktop.org/dist/']
 sources = [SOURCELOWER_TAR_GZ]
 
 dependencies = [
diff --git a/easybuild/easyconfigs/x/xcb-util-renderutil/xcb-util-renderutil-0.3.9-intel-2015b-Python-2.7.11.eb b/easybuild/easyconfigs/x/xcb-util-renderutil/xcb-util-renderutil-0.3.9-intel-2015b-Python-2.7.11.eb
index 5ab8e229a6b75d3d277a914747e72eeb4d224683..1254207ef5d0249b21104f78d471ef97723d8513 100644
--- a/easybuild/easyconfigs/x/xcb-util-renderutil/xcb-util-renderutil-0.3.9-intel-2015b-Python-2.7.11.eb
+++ b/easybuild/easyconfigs/x/xcb-util-renderutil/xcb-util-renderutil-0.3.9-intel-2015b-Python-2.7.11.eb
@@ -9,7 +9,7 @@ description = """The xcb-util-renderutil package provides additional extensions
 
 toolchain = {'name': 'intel', 'version': '2015b'}
 
-source_urls  = ['http://xcb.freedesktop.org/dist/']
+source_urls = ['http://xcb.freedesktop.org/dist/']
 sources = [SOURCELOWER_TAR_GZ]
 
 dependencies = [
diff --git a/easybuild/easyconfigs/x/xcb-util-renderutil/xcb-util-renderutil-0.3.9-intel-2015b.eb b/easybuild/easyconfigs/x/xcb-util-renderutil/xcb-util-renderutil-0.3.9-intel-2015b.eb
index bf0147fea6275fe12ed3753342d5fb0ef6175b14..561b237980b293155b5954ac354a7dd2b691170a 100644
--- a/easybuild/easyconfigs/x/xcb-util-renderutil/xcb-util-renderutil-0.3.9-intel-2015b.eb
+++ b/easybuild/easyconfigs/x/xcb-util-renderutil/xcb-util-renderutil-0.3.9-intel-2015b.eb
@@ -8,7 +8,7 @@ description = """The xcb-util-renderutil package provides additional extensions
 
 toolchain = {'name': 'intel', 'version': '2015b'}
 
-source_urls  = ['http://xcb.freedesktop.org/dist/']
+source_urls = ['http://xcb.freedesktop.org/dist/']
 sources = [SOURCELOWER_TAR_GZ]
 
 dependencies = [
diff --git a/easybuild/easyconfigs/x/xcb-util-wm/xcb-util-wm-0.4.1-intel-2015b-Python-2.7.11.eb b/easybuild/easyconfigs/x/xcb-util-wm/xcb-util-wm-0.4.1-intel-2015b-Python-2.7.11.eb
index a3589e6112e4865bf6dd06a58a01afaf7ac7b2f9..39589444102cec3cfbedf74607e3c333892bc86a 100644
--- a/easybuild/easyconfigs/x/xcb-util-wm/xcb-util-wm-0.4.1-intel-2015b-Python-2.7.11.eb
+++ b/easybuild/easyconfigs/x/xcb-util-wm/xcb-util-wm-0.4.1-intel-2015b-Python-2.7.11.eb
@@ -9,7 +9,7 @@ description = """The xcb-util-wm package contains libraries which provide client
 
 toolchain = {'name': 'intel', 'version': '2015b'}
 
-source_urls  = ['http://xcb.freedesktop.org/dist/']
+source_urls = ['http://xcb.freedesktop.org/dist/']
 sources = [SOURCELOWER_TAR_GZ]
 
 dependencies = [
diff --git a/easybuild/easyconfigs/x/xcb-util-wm/xcb-util-wm-0.4.1-intel-2015b.eb b/easybuild/easyconfigs/x/xcb-util-wm/xcb-util-wm-0.4.1-intel-2015b.eb
index 0ee7ac8271bc871f9d8f19d406d4cf940271f1fd..147e33bc0cd18eccbaec8bb76be0d1c6f746373c 100644
--- a/easybuild/easyconfigs/x/xcb-util-wm/xcb-util-wm-0.4.1-intel-2015b.eb
+++ b/easybuild/easyconfigs/x/xcb-util-wm/xcb-util-wm-0.4.1-intel-2015b.eb
@@ -8,7 +8,7 @@ description = """The xcb-util-wm package contains libraries which provide client
 
 toolchain = {'name': 'intel', 'version': '2015b'}
 
-source_urls  = ['http://xcb.freedesktop.org/dist/']
+source_urls = ['http://xcb.freedesktop.org/dist/']
 sources = [SOURCELOWER_TAR_GZ]
 
 dependencies = [
diff --git a/easybuild/easyconfigs/x/xcb-util/xcb-util-0.4.0-intel-2015b-Python-2.7.11.eb b/easybuild/easyconfigs/x/xcb-util/xcb-util-0.4.0-intel-2015b-Python-2.7.11.eb
index a89385186985aa17f9dcc8c1d690378ebb515fab..0587deb544f195d11a27daa1619f23ab685e1430 100644
--- a/easybuild/easyconfigs/x/xcb-util/xcb-util-0.4.0-intel-2015b-Python-2.7.11.eb
+++ b/easybuild/easyconfigs/x/xcb-util/xcb-util-0.4.0-intel-2015b-Python-2.7.11.eb
@@ -10,7 +10,7 @@ description = """The xcb-util package provides additional extensions to the XCB
 
 toolchain = {'name': 'intel', 'version': '2015b'}
 
-source_urls  = ['http://xcb.freedesktop.org/dist/']
+source_urls = ['http://xcb.freedesktop.org/dist/']
 sources = [SOURCELOWER_TAR_GZ]
 
 dependencies = [
diff --git a/easybuild/easyconfigs/x/xcb-util/xcb-util-0.4.0-intel-2015b.eb b/easybuild/easyconfigs/x/xcb-util/xcb-util-0.4.0-intel-2015b.eb
index 8fd3b74ca5e2768b40e720195682558f49010223..a6a5649a3cbccef031a01c01a195dc690d988317 100644
--- a/easybuild/easyconfigs/x/xcb-util/xcb-util-0.4.0-intel-2015b.eb
+++ b/easybuild/easyconfigs/x/xcb-util/xcb-util-0.4.0-intel-2015b.eb
@@ -9,7 +9,7 @@ description = """The xcb-util package provides additional extensions to the XCB
 
 toolchain = {'name': 'intel', 'version': '2015b'}
 
-source_urls  = ['http://xcb.freedesktop.org/dist/']
+source_urls = ['http://xcb.freedesktop.org/dist/']
 sources = [SOURCELOWER_TAR_GZ]
 
 dependencies = [
diff --git a/easybuild/easyconfigs/x/xextproto/xextproto-7.2.1-goolf-1.4.10.eb b/easybuild/easyconfigs/x/xextproto/xextproto-7.2.1-goolf-1.4.10.eb
index 3418593f36329ab1c39b2a4298996f2c36b99242..d4118dc48ce1d7b367bfce1d335abbba6cf97445 100644
--- a/easybuild/easyconfigs/x/xextproto/xextproto-7.2.1-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/x/xextproto/xextproto-7.2.1-goolf-1.4.10.eb
@@ -15,10 +15,10 @@ source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
 
 sanity_check_paths = {
     'files': ['include/X11/extensions/%s' % x for x in [
-            'agproto.h', 'cupproto.h', 'dbeproto.h', 'dpmsproto.h', 'EVIproto.h', 'geproto.h', 'lbxproto.h',
-            'mitmiscproto.h', 'multibufproto.h', 'securproto.h', 'shapeproto.h', 'shm.h', 'shmstr.h', 'syncproto.h',
-            'xtestconst.h', 'xtestext1proto.h'
-        ]
+        'agproto.h', 'cupproto.h', 'dbeproto.h', 'dpmsproto.h', 'EVIproto.h', 'geproto.h', 'lbxproto.h',
+        'mitmiscproto.h', 'multibufproto.h', 'securproto.h', 'shapeproto.h', 'shm.h', 'shmstr.h', 'syncproto.h',
+        'xtestconst.h', 'xtestext1proto.h'
+    ]
     ],
     'dirs': []
 }
diff --git a/easybuild/easyconfigs/x/xextproto/xextproto-7.2.1-goolf-1.5.14.eb b/easybuild/easyconfigs/x/xextproto/xextproto-7.2.1-goolf-1.5.14.eb
index 3c2320e860aea6c7d197ad26c8ab5acb2c196ec4..6e6a5a03b256bee77f205380195063370f8f8290 100644
--- a/easybuild/easyconfigs/x/xextproto/xextproto-7.2.1-goolf-1.5.14.eb
+++ b/easybuild/easyconfigs/x/xextproto/xextproto-7.2.1-goolf-1.5.14.eb
@@ -15,10 +15,10 @@ source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
 
 sanity_check_paths = {
     'files': ['include/X11/extensions/%s' % x for x in [
-            'agproto.h', 'cupproto.h', 'dbeproto.h', 'dpmsproto.h', 'EVIproto.h', 'geproto.h', 'lbxproto.h',
-            'mitmiscproto.h', 'multibufproto.h', 'securproto.h', 'shapeproto.h', 'shm.h', 'shmstr.h', 'syncproto.h',
-            'xtestconst.h', 'xtestext1proto.h'
-        ]
+        'agproto.h', 'cupproto.h', 'dbeproto.h', 'dpmsproto.h', 'EVIproto.h', 'geproto.h', 'lbxproto.h',
+        'mitmiscproto.h', 'multibufproto.h', 'securproto.h', 'shapeproto.h', 'shm.h', 'shmstr.h', 'syncproto.h',
+        'xtestconst.h', 'xtestext1proto.h'
+    ]
     ],
     'dirs': []
 }
diff --git a/easybuild/easyconfigs/x/xextproto/xextproto-7.2.1-ictce-4.1.13.eb b/easybuild/easyconfigs/x/xextproto/xextproto-7.2.1-ictce-4.1.13.eb
index 447dc3ac65a3ba955cf2adf65b30e44353b2bf4e..054bc51cbee498f6ff9a400dac618bdf399c38a7 100644
--- a/easybuild/easyconfigs/x/xextproto/xextproto-7.2.1-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/x/xextproto/xextproto-7.2.1-ictce-4.1.13.eb
@@ -14,10 +14,10 @@ source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
 
 sanity_check_paths = {
     'files': ['include/X11/extensions/%s' % x for x in [
-            'agproto.h', 'cupproto.h', 'dbeproto.h', 'dpmsproto.h', 'EVIproto.h', 'geproto.h', 'lbxproto.h',
-            'mitmiscproto.h', 'multibufproto.h', 'securproto.h', 'shapeproto.h', 'shm.h', 'shmstr.h', 'syncproto.h',
-            'xtestconst.h', 'xtestext1proto.h'
-        ]
+        'agproto.h', 'cupproto.h', 'dbeproto.h', 'dpmsproto.h', 'EVIproto.h', 'geproto.h', 'lbxproto.h',
+        'mitmiscproto.h', 'multibufproto.h', 'securproto.h', 'shapeproto.h', 'shm.h', 'shmstr.h', 'syncproto.h',
+        'xtestconst.h', 'xtestext1proto.h'
+    ]
     ],
     'dirs': []
 }
diff --git a/easybuild/easyconfigs/x/xextproto/xextproto-7.2.1-ictce-5.3.0.eb b/easybuild/easyconfigs/x/xextproto/xextproto-7.2.1-ictce-5.3.0.eb
index 6256b4a10c6d7ec4790caa8727d1414b33840f0c..4f5a5e2a0d16034a69ca84eb6d8ba121cb6efead 100644
--- a/easybuild/easyconfigs/x/xextproto/xextproto-7.2.1-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/x/xextproto/xextproto-7.2.1-ictce-5.3.0.eb
@@ -14,10 +14,10 @@ source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
 
 sanity_check_paths = {
     'files': ['include/X11/extensions/%s' % x for x in [
-            'agproto.h', 'cupproto.h', 'dbeproto.h', 'dpmsproto.h', 'EVIproto.h', 'geproto.h', 'lbxproto.h',
-            'mitmiscproto.h', 'multibufproto.h', 'securproto.h', 'shapeproto.h', 'shm.h', 'shmstr.h', 'syncproto.h',
-            'xtestconst.h', 'xtestext1proto.h'
-        ]
+        'agproto.h', 'cupproto.h', 'dbeproto.h', 'dpmsproto.h', 'EVIproto.h', 'geproto.h', 'lbxproto.h',
+        'mitmiscproto.h', 'multibufproto.h', 'securproto.h', 'shapeproto.h', 'shm.h', 'shmstr.h', 'syncproto.h',
+        'xtestconst.h', 'xtestext1proto.h'
+    ]
     ],
     'dirs': []
 }
diff --git a/easybuild/easyconfigs/x/xextproto/xextproto-7.2.1-intel-2014b.eb b/easybuild/easyconfigs/x/xextproto/xextproto-7.2.1-intel-2014b.eb
index d79aece7ee693d9cd8099335a6693ccc9c6f8b6d..829a1e95f8ac0b81cf9c562558aec7b96fe4de1a 100644
--- a/easybuild/easyconfigs/x/xextproto/xextproto-7.2.1-intel-2014b.eb
+++ b/easybuild/easyconfigs/x/xextproto/xextproto-7.2.1-intel-2014b.eb
@@ -14,10 +14,10 @@ source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
 
 sanity_check_paths = {
     'files': ['include/X11/extensions/%s' % x for x in [
-            'agproto.h', 'cupproto.h', 'dbeproto.h', 'dpmsproto.h', 'EVIproto.h', 'geproto.h', 'lbxproto.h',
-            'mitmiscproto.h', 'multibufproto.h', 'securproto.h', 'shapeproto.h', 'shm.h', 'shmstr.h', 'syncproto.h',
-            'xtestconst.h', 'xtestext1proto.h'
-        ]
+        'agproto.h', 'cupproto.h', 'dbeproto.h', 'dpmsproto.h', 'EVIproto.h', 'geproto.h', 'lbxproto.h',
+        'mitmiscproto.h', 'multibufproto.h', 'securproto.h', 'shapeproto.h', 'shm.h', 'shmstr.h', 'syncproto.h',
+        'xtestconst.h', 'xtestext1proto.h'
+    ]
     ],
     'dirs': []
 }
diff --git a/easybuild/easyconfigs/x/xextproto/xextproto-7.3.0-foss-2014b.eb b/easybuild/easyconfigs/x/xextproto/xextproto-7.3.0-foss-2014b.eb
index bfc2d59685160d91edb8da79a8162a64829dcfc2..0c9b21f3fbef7a235aa2cdd190f2e597fbb287b4 100644
--- a/easybuild/easyconfigs/x/xextproto/xextproto-7.3.0-foss-2014b.eb
+++ b/easybuild/easyconfigs/x/xextproto/xextproto-7.3.0-foss-2014b.eb
@@ -14,10 +14,10 @@ source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
 
 sanity_check_paths = {
     'files': ['include/X11/extensions/%s' % x for x in [
-            'agproto.h', 'cupproto.h', 'dbeproto.h', 'dpmsproto.h', 'EVIproto.h', 'geproto.h', 'lbxproto.h',
-            'mitmiscproto.h', 'multibufproto.h', 'securproto.h', 'shapeproto.h', 'shm.h', 'shmstr.h', 'syncproto.h',
-            'xtestconst.h', 'xtestext1proto.h'
-        ]
+        'agproto.h', 'cupproto.h', 'dbeproto.h', 'dpmsproto.h', 'EVIproto.h', 'geproto.h', 'lbxproto.h',
+        'mitmiscproto.h', 'multibufproto.h', 'securproto.h', 'shapeproto.h', 'shm.h', 'shmstr.h', 'syncproto.h',
+        'xtestconst.h', 'xtestext1proto.h'
+    ]
     ],
     'dirs': []
 }
diff --git a/easybuild/easyconfigs/x/xextproto/xextproto-7.3.0-goolf-1.5.14.eb b/easybuild/easyconfigs/x/xextproto/xextproto-7.3.0-goolf-1.5.14.eb
index 19c9e6fc6f5f08a30d5f1e3729d82dcdcfcf812c..18ab59d5aeaff24c87a372276936874154ee345a 100644
--- a/easybuild/easyconfigs/x/xextproto/xextproto-7.3.0-goolf-1.5.14.eb
+++ b/easybuild/easyconfigs/x/xextproto/xextproto-7.3.0-goolf-1.5.14.eb
@@ -14,10 +14,10 @@ source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
 
 sanity_check_paths = {
     'files': ['include/X11/extensions/%s' % x for x in [
-            'agproto.h', 'cupproto.h', 'dbeproto.h', 'dpmsproto.h', 'EVIproto.h', 'geproto.h', 'lbxproto.h',
-            'mitmiscproto.h', 'multibufproto.h', 'securproto.h', 'shapeproto.h', 'shm.h', 'shmstr.h', 'syncproto.h',
-            'xtestconst.h', 'xtestext1proto.h'
-        ]
+        'agproto.h', 'cupproto.h', 'dbeproto.h', 'dpmsproto.h', 'EVIproto.h', 'geproto.h', 'lbxproto.h',
+        'mitmiscproto.h', 'multibufproto.h', 'securproto.h', 'shapeproto.h', 'shm.h', 'shmstr.h', 'syncproto.h',
+        'xtestconst.h', 'xtestext1proto.h'
+    ]
     ],
     'dirs': []
 }
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 d03ad18e50eb66f71f62563b7d5563721e0daf2a..673a0e5e21b4c1adb81ed87da772663e066d2a3e 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
@@ -14,10 +14,10 @@ source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
 
 sanity_check_paths = {
     'files': ['include/X11/extensions/%s' % x for x in [
-            'agproto.h', 'cupproto.h', 'dbeproto.h', 'dpmsproto.h', 'EVIproto.h', 'geproto.h', 'lbxproto.h',
-            'mitmiscproto.h', 'multibufproto.h', 'securproto.h', 'shapeproto.h', 'shm.h', 'shmstr.h', 'syncproto.h',
-            'xtestconst.h', 'xtestext1proto.h'
-        ]
+        'agproto.h', 'cupproto.h', 'dbeproto.h', 'dpmsproto.h', 'EVIproto.h', 'geproto.h', 'lbxproto.h',
+        'mitmiscproto.h', 'multibufproto.h', 'securproto.h', 'shapeproto.h', 'shm.h', 'shmstr.h', 'syncproto.h',
+        'xtestconst.h', 'xtestext1proto.h'
+    ]
     ],
     'dirs': []
 }
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 01075a73cf5416b5084188dcdb594114ab5e03a7..494a482b649514d00e5a4311c60788bc298ea973 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
@@ -14,10 +14,10 @@ source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
 
 sanity_check_paths = {
     'files': ['include/X11/extensions/%s' % x for x in [
-            'agproto.h', 'cupproto.h', 'dbeproto.h', 'dpmsproto.h', 'EVIproto.h', 'geproto.h', 'lbxproto.h',
-            'mitmiscproto.h', 'multibufproto.h', 'securproto.h', 'shapeproto.h', 'shm.h', 'shmstr.h', 'syncproto.h',
-            'xtestconst.h', 'xtestext1proto.h'
-        ]
+        'agproto.h', 'cupproto.h', 'dbeproto.h', 'dpmsproto.h', 'EVIproto.h', 'geproto.h', 'lbxproto.h',
+        'mitmiscproto.h', 'multibufproto.h', 'securproto.h', 'shapeproto.h', 'shm.h', 'shmstr.h', 'syncproto.h',
+        'xtestconst.h', 'xtestext1proto.h'
+    ]
     ],
     'dirs': []
 }
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 983804175f7a09766f89e4ab43793a66562d0601..6c19b3821ef87128011a3bb14ae1bd27ca361659 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
@@ -14,10 +14,10 @@ source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
 
 sanity_check_paths = {
     'files': ['include/X11/extensions/%s' % x for x in [
-            'agproto.h', 'cupproto.h', 'dbeproto.h', 'dpmsproto.h', 'EVIproto.h', 'geproto.h', 'lbxproto.h',
-            'mitmiscproto.h', 'multibufproto.h', 'securproto.h', 'shapeproto.h', 'shm.h', 'shmstr.h', 'syncproto.h',
-            'xtestconst.h', 'xtestext1proto.h'
-        ]
+        'agproto.h', 'cupproto.h', 'dbeproto.h', 'dpmsproto.h', 'EVIproto.h', 'geproto.h', 'lbxproto.h',
+        'mitmiscproto.h', 'multibufproto.h', 'securproto.h', 'shapeproto.h', 'shm.h', 'shmstr.h', 'syncproto.h',
+        'xtestconst.h', 'xtestext1proto.h'
+    ]
     ],
     'dirs': []
 }
diff --git a/easybuild/easyconfigs/x/xineramaproto/xineramaproto-1.2.1-foss-2014b.eb b/easybuild/easyconfigs/x/xineramaproto/xineramaproto-1.2.1-foss-2014b.eb
index 83415bc67b5bf68d24f17bd8aa58d5d5d1a432cf..b0ee431324a89b1fa3fadff020277b8bf19ef059 100644
--- a/easybuild/easyconfigs/x/xineramaproto/xineramaproto-1.2.1-foss-2014b.eb
+++ b/easybuild/easyconfigs/x/xineramaproto/xineramaproto-1.2.1-foss-2014b.eb
@@ -12,8 +12,8 @@ sources = [SOURCE_TAR_GZ]
 source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
 
 sanity_check_paths = {
-    'files' : ['include/X11/extensions/panoramiXproto.h'],
-    'dirs' : []
+    'files': ['include/X11/extensions/panoramiXproto.h'],
+    'dirs': []
 }
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/x/xineramaproto/xineramaproto-1.2.1-intel-2014b.eb b/easybuild/easyconfigs/x/xineramaproto/xineramaproto-1.2.1-intel-2014b.eb
index 16a5aa86104978bc21ef555a81665ea8a7798b30..797b75e5e7bbef845864e69455f8815e058f126b 100644
--- a/easybuild/easyconfigs/x/xineramaproto/xineramaproto-1.2.1-intel-2014b.eb
+++ b/easybuild/easyconfigs/x/xineramaproto/xineramaproto-1.2.1-intel-2014b.eb
@@ -12,8 +12,8 @@ sources = [SOURCE_TAR_GZ]
 source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
 
 sanity_check_paths = {
-    'files' : ['include/X11/extensions/panoramiXproto.h'],
-    'dirs' : []
+    'files': ['include/X11/extensions/panoramiXproto.h'],
+    'dirs': []
 }
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/x/xineramaproto/xineramaproto-1.2.1-intel-2015b.eb b/easybuild/easyconfigs/x/xineramaproto/xineramaproto-1.2.1-intel-2015b.eb
index 75a6e48c1023b14155af04b9c43991fee5eca60a..e96e89759a86700ca7123ceac83cc42d8cdf545b 100644
--- a/easybuild/easyconfigs/x/xineramaproto/xineramaproto-1.2.1-intel-2015b.eb
+++ b/easybuild/easyconfigs/x/xineramaproto/xineramaproto-1.2.1-intel-2015b.eb
@@ -12,8 +12,8 @@ sources = [SOURCE_TAR_GZ]
 source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
 
 sanity_check_paths = {
-    'files' : ['include/X11/extensions/panoramiXproto.h'],
-    'dirs' : []
+    'files': ['include/X11/extensions/panoramiXproto.h'],
+    'dirs': []
 }
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/x/xorg-macros/xorg-macros-1.19.0-intel-2016a.eb b/easybuild/easyconfigs/x/xorg-macros/xorg-macros-1.19.0-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..0697bb42ab9d8303dd75ce8c509379b9813c1535
--- /dev/null
+++ b/easybuild/easyconfigs/x/xorg-macros/xorg-macros-1.19.0-intel-2016a.eb
@@ -0,0 +1,22 @@
+easyblock = 'ConfigureMake'
+
+name = 'xorg-macros'
+version = '1.19.0'
+
+homepage = 'http://cgit.freedesktop.org/xorg/util/macros'
+description = """X.org macros utilities."""
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+source_urls = ['http://cgit.freedesktop.org/xorg/util/macros/snapshot']  # no slash ('/') at the end!
+sources = ['util-macros-%(version)s.tar.gz']
+
+builddependencies = [('Autotools', '20150215')]
+
+preconfigopts = './autogen.sh && '
+
+sanity_check_paths = {
+    'files': ['share/pkgconfig/xorg-macros.pc'],
+    'dirs': [],
+}
+
+moduleclass = 'devel'
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 0b9f7d0f3f3a4839ae1d3938d7b9d4fac9b2ee49..f6c2e0c627b075726d7115f1f7daf97452286747 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
@@ -13,12 +13,12 @@ sources = [SOURCE_TAR_GZ]
 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',
-                                 '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']],
-                      'dirs' : []
-                     }
+    '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',
+                                             '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']],
+    'dirs': []
+}
 
 moduleclass = 'devel'
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 e7dc372ce2a7e062a185e19ebc603691eeff3153..241268e4a6c250cc3afa9d885fb710d70dd88936 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
@@ -13,12 +13,12 @@ sources = [SOURCE_TAR_GZ]
 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',
-               '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']],
-    'dirs' : []
+    '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',
+                                             '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']],
+    'dirs': []
 }
 
 moduleclass = 'devel'
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 4a07188aa909ed4e1cdd9aa855e861763da2fec0..ab202e507532e16f135c812ab42446b513357916 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
@@ -13,12 +13,12 @@ sources = [SOURCE_TAR_GZ]
 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',
-               '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']],
-    'dirs' : []
+    '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',
+                                             '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']],
+    'dirs': []
 }
 
 moduleclass = 'devel'
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 0b738cf50c8a3715adf1f0aa5de186d71b146a5b..e0f4abf1448d084414f892cfa66803384cc8c244 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
@@ -13,12 +13,12 @@ sources = [SOURCE_TAR_GZ]
 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',
-                                 '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']],
-                      'dirs' : []
-                     }
+    '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',
+                                             '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']],
+    'dirs': []
+}
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/x/xproto/xproto-7.0.23-ictce-4.1.13.eb b/easybuild/easyconfigs/x/xproto/xproto-7.0.23-ictce-4.1.13.eb
index 5f36cfb20c09c032c1e3b61a7a66c3c59b6f5087..884e64e8dd8f66d19644f74cb1f79a8f24eb849c 100644
--- a/easybuild/easyconfigs/x/xproto/xproto-7.0.23-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/x/xproto/xproto-7.0.23-ictce-4.1.13.eb
@@ -14,10 +14,10 @@ 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',
-              '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']],
+                                             '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']],
     'dirs': []
 }
 
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 90b584a81efa408643c3f19cd51be2945e82b51c..8f17ba5d4548d5ababdb1fda5135bf1348bdf3c9 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
@@ -14,12 +14,12 @@ sources = [SOURCE_TAR_GZ]
 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',
-                                 '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']],
-                      'dirs' : []
-                     }
+    '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',
+                                             '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']],
+    'dirs': []
+}
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/x/xproto/xproto-7.0.26-foss-2014b.eb b/easybuild/easyconfigs/x/xproto/xproto-7.0.26-foss-2014b.eb
index 14e0666049a4219a89023782dcf52fc36ae3f48e..bdb6d9e8c701ee8d763836894a3f811ffd2bdf7c 100644
--- a/easybuild/easyconfigs/x/xproto/xproto-7.0.26-foss-2014b.eb
+++ b/easybuild/easyconfigs/x/xproto/xproto-7.0.26-foss-2014b.eb
@@ -13,12 +13,12 @@ sources = [SOURCE_TAR_GZ]
 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',
-               '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']],
-    'dirs' : []
+    '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',
+                                             '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']],
+    'dirs': []
 }
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/x/xproto/xproto-7.0.26-intel-2014b.eb b/easybuild/easyconfigs/x/xproto/xproto-7.0.26-intel-2014b.eb
index f620518acaaab369b02b3b9c27ad13cda77cb88c..74b305ce8c828651f3040eb014a71653751ec448 100644
--- a/easybuild/easyconfigs/x/xproto/xproto-7.0.26-intel-2014b.eb
+++ b/easybuild/easyconfigs/x/xproto/xproto-7.0.26-intel-2014b.eb
@@ -13,12 +13,12 @@ sources = [SOURCE_TAR_GZ]
 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',
-               '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']],
-    'dirs' : []
+    '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',
+                                             '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']],
+    'dirs': []
 }
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/x/xproto/xproto-7.0.27-goolf-1.5.14.eb b/easybuild/easyconfigs/x/xproto/xproto-7.0.27-goolf-1.5.14.eb
index 818673c9f98a6acac8f566ebae99f9f111b4dda4..4ec0e6221a7c612c24699e3a2e5b86a66df6442e 100644
--- a/easybuild/easyconfigs/x/xproto/xproto-7.0.27-goolf-1.5.14.eb
+++ b/easybuild/easyconfigs/x/xproto/xproto-7.0.27-goolf-1.5.14.eb
@@ -13,12 +13,12 @@ sources = [SOURCE_TAR_GZ]
 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',
-               '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']],
-    'dirs' : []
+    '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',
+                                             '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']],
+    'dirs': []
 }
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/x/xproto/xproto-7.0.27-intel-2015a.eb b/easybuild/easyconfigs/x/xproto/xproto-7.0.27-intel-2015a.eb
index 4093d23e909f0f6487b35f92d55620d48aca448a..f9bd7118c837200cfcb7eee52a81220e59b587b1 100644
--- a/easybuild/easyconfigs/x/xproto/xproto-7.0.27-intel-2015a.eb
+++ b/easybuild/easyconfigs/x/xproto/xproto-7.0.27-intel-2015a.eb
@@ -13,12 +13,12 @@ sources = [SOURCE_TAR_GZ]
 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',
-               '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']],
-    'dirs' : []
+    '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',
+                                             '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']],
+    'dirs': []
 }
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/x/xproto/xproto-7.0.28-intel-2015b.eb b/easybuild/easyconfigs/x/xproto/xproto-7.0.28-intel-2015b.eb
index 08bc258df3534f16dfb00cd387c98018366c0f51..d3de936da46b57f5ef1573b304b49a0a1db6e1e3 100644
--- a/easybuild/easyconfigs/x/xproto/xproto-7.0.28-intel-2015b.eb
+++ b/easybuild/easyconfigs/x/xproto/xproto-7.0.28-intel-2015b.eb
@@ -13,12 +13,12 @@ sources = [SOURCE_TAR_GZ]
 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',
-               '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']],
-    'dirs' : []
+    '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',
+                                             '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']],
+    'dirs': []
 }
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/x/xtrans/xtrans-1.2-goolf-1.4.10.eb b/easybuild/easyconfigs/x/xtrans/xtrans-1.2-goolf-1.4.10.eb
index 6676a3761dc18eb9f69fdfba24582193d35f91da..6694ef584a94bab40dc8a14d8a74c6f01bb18e68 100644
--- a/easybuild/easyconfigs/x/xtrans/xtrans-1.2-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/x/xtrans/xtrans-1.2-goolf-1.4.10.eb
@@ -15,12 +15,10 @@ sources = [SOURCE_TAR_GZ]
 source_urls = [XORG_LIB_SOURCE]
 
 sanity_check_paths = {
-    'files' : ['include/X11/Xtrans/%s' % x for x in [
-        'transport.c', 'Xtrans.c', 'Xtransdnet.c', 'Xtrans.h', 'Xtransint.h', 'Xtranslcl.c', 'Xtransos2.c',
-        'Xtranssock.c', 'Xtranstli.c', 'Xtransutil.c'
-        ]
-    ],
-    'dirs' : []
+    'files': ['include/X11/Xtrans/%s' % x for x in ['transport.c', 'Xtrans.c', 'Xtransdnet.c', 'Xtrans.h',
+                                                    'Xtransint.h', 'Xtranslcl.c', 'Xtransos2.c', 'Xtranssock.c',
+                                                    'Xtranstli.c', 'Xtransutil.c']],
+    'dirs': [],
 }
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/x/xtrans/xtrans-1.2-goolf-1.5.14.eb b/easybuild/easyconfigs/x/xtrans/xtrans-1.2-goolf-1.5.14.eb
index 55dfe1aab50729fd2845ceec7a90e67f1af3b5c4..7ac7af4a531acdcd466826e9f2c2aeeae31475ac 100644
--- a/easybuild/easyconfigs/x/xtrans/xtrans-1.2-goolf-1.5.14.eb
+++ b/easybuild/easyconfigs/x/xtrans/xtrans-1.2-goolf-1.5.14.eb
@@ -15,12 +15,10 @@ sources = [SOURCE_TAR_GZ]
 source_urls = [XORG_LIB_SOURCE]
 
 sanity_check_paths = {
-    'files' : ['include/X11/Xtrans/%s' % x for x in [
-        'transport.c', 'Xtrans.c', 'Xtransdnet.c', 'Xtrans.h', 'Xtransint.h', 'Xtranslcl.c', 'Xtransos2.c',
-        'Xtranssock.c', 'Xtranstli.c', 'Xtransutil.c'
-        ]
-    ],
-    'dirs' : []
+    'files': ['include/X11/Xtrans/%s' % x for x in ['transport.c', 'Xtrans.c', 'Xtransdnet.c', 'Xtrans.h',
+                                                    'Xtransint.h', 'Xtranslcl.c', 'Xtransos2.c', 'Xtranssock.c',
+                                                    'Xtranstli.c', 'Xtransutil.c']],
+    'dirs': [],
 }
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/x/xtrans/xtrans-1.2-ictce-4.1.13.eb b/easybuild/easyconfigs/x/xtrans/xtrans-1.2-ictce-4.1.13.eb
index ae5d033d58a65d14b3cd29e77591d0aa3ced1ce6..ec378cd83cac7976434292ca840925091fc9cd01 100644
--- a/easybuild/easyconfigs/x/xtrans/xtrans-1.2-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/x/xtrans/xtrans-1.2-ictce-4.1.13.eb
@@ -14,12 +14,10 @@ sources = [SOURCE_TAR_GZ]
 source_urls = [XORG_LIB_SOURCE]
 
 sanity_check_paths = {
-    'files' : ['include/X11/Xtrans/%s' % x for x in [
-        'transport.c', 'Xtrans.c', 'Xtransdnet.c', 'Xtrans.h', 'Xtransint.h', 'Xtranslcl.c', 'Xtransos2.c',
-        'Xtranssock.c', 'Xtranstli.c', 'Xtransutil.c'
-        ]
-    ],
-    'dirs' : []
+    'files': ['include/X11/Xtrans/%s' % x for x in ['transport.c', 'Xtrans.c', 'Xtransdnet.c', 'Xtrans.h',
+                                                    'Xtransint.h', 'Xtranslcl.c', 'Xtransos2.c', 'Xtranssock.c',
+                                                    'Xtranstli.c', 'Xtransutil.c']],
+    'dirs': [],
 }
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/x/xtrans/xtrans-1.2-ictce-5.3.0.eb b/easybuild/easyconfigs/x/xtrans/xtrans-1.2-ictce-5.3.0.eb
index c4c078f4c4bf1ee7face19fe4a68e79289c8c748..98cc20e54357d8ac72b16b88fb66c401bb753582 100644
--- a/easybuild/easyconfigs/x/xtrans/xtrans-1.2-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/x/xtrans/xtrans-1.2-ictce-5.3.0.eb
@@ -15,12 +15,10 @@ sources = [SOURCE_TAR_GZ]
 source_urls = [XORG_LIB_SOURCE]
 
 sanity_check_paths = {
-    'files' : ['include/X11/Xtrans/%s' % x for x in [
-        'transport.c', 'Xtrans.c', 'Xtransdnet.c', 'Xtrans.h', 'Xtransint.h', 'Xtranslcl.c', 'Xtransos2.c',
-        'Xtranssock.c', 'Xtranstli.c', 'Xtransutil.c'
-        ]
-    ],
-    'dirs' : []
+    'files': ['include/X11/Xtrans/%s' % x for x in ['transport.c', 'Xtrans.c', 'Xtransdnet.c', 'Xtrans.h',
+                                                    'Xtransint.h', 'Xtranslcl.c', 'Xtransos2.c', 'Xtranssock.c',
+                                                    'Xtranstli.c', 'Xtransutil.c']],
+    'dirs': [],
 }
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/x/xtrans/xtrans-1.2.6-foss-2014b.eb b/easybuild/easyconfigs/x/xtrans/xtrans-1.2.6-foss-2014b.eb
index 825d041de58eb257090c504fae2028eb84336051..0edc961a34c202aba33501ac2fa35e44f5247e1e 100644
--- a/easybuild/easyconfigs/x/xtrans/xtrans-1.2.6-foss-2014b.eb
+++ b/easybuild/easyconfigs/x/xtrans/xtrans-1.2.6-foss-2014b.eb
@@ -15,12 +15,9 @@ sources = [SOURCE_TAR_GZ]
 source_urls = [XORG_LIB_SOURCE]
 
 sanity_check_paths = {
-    'files' : ['include/X11/Xtrans/%s' % x for x in [
-        'transport.c', 'Xtrans.c', 'Xtrans.h', 'Xtransint.h', 'Xtranslcl.c',
-        'Xtranssock.c', 'Xtranstli.c', 'Xtransutil.c'
-        ]
-    ],
-    'dirs' : []
+    'files': ['include/X11/Xtrans/%s' % x for x in ['transport.c', 'Xtrans.c', 'Xtrans.h', 'Xtransint.h',
+                                                    'Xtranslcl.c', 'Xtranssock.c', 'Xtranstli.c', 'Xtransutil.c']],
+    'dirs': [],
 }
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/x/xtrans/xtrans-1.3.4-intel-2014b.eb b/easybuild/easyconfigs/x/xtrans/xtrans-1.3.4-intel-2014b.eb
index d17e97131363b4ff81d852e791710940c254acbc..1a4f54a0c5daea431ce53b4308bfe5ee28f92974 100644
--- a/easybuild/easyconfigs/x/xtrans/xtrans-1.3.4-intel-2014b.eb
+++ b/easybuild/easyconfigs/x/xtrans/xtrans-1.3.4-intel-2014b.eb
@@ -15,12 +15,9 @@ sources = [SOURCE_TAR_GZ]
 source_urls = [XORG_LIB_SOURCE]
 
 sanity_check_paths = {
-    'files' : ['include/X11/Xtrans/%s' % x for x in [
-        'transport.c', 'Xtrans.c', 'Xtrans.h', 'Xtransint.h', 'Xtranslcl.c',
-        'Xtranssock.c', 'Xtransutil.c'
-        ]
-    ],
-    'dirs' : []
+    'files': ['include/X11/Xtrans/%s' % x for x in ['transport.c', 'Xtrans.c', 'Xtrans.h', 'Xtransint.h',
+                                                    'Xtranslcl.c', 'Xtranssock.c', 'Xtransutil.c']],
+    'dirs': [],
 }
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/x/xtrans/xtrans-1.3.4-intel-2015a.eb b/easybuild/easyconfigs/x/xtrans/xtrans-1.3.4-intel-2015a.eb
index dc21e51c71d9c7a650e692a435ba43f3b4d25003..01968fd48941cf587e3c94bceee4b01dfeae5902 100644
--- a/easybuild/easyconfigs/x/xtrans/xtrans-1.3.4-intel-2015a.eb
+++ b/easybuild/easyconfigs/x/xtrans/xtrans-1.3.4-intel-2015a.eb
@@ -15,12 +15,9 @@ sources = [SOURCE_TAR_GZ]
 source_urls = [XORG_LIB_SOURCE]
 
 sanity_check_paths = {
-    'files' : ['include/X11/Xtrans/%s' % x for x in [
-        'transport.c', 'Xtrans.c', 'Xtrans.h', 'Xtransint.h', 'Xtranslcl.c',
-        'Xtranssock.c', 'Xtransutil.c'
-        ]
-    ],
-    'dirs' : []
+    'files': ['include/X11/Xtrans/%s' % x for x in ['transport.c', 'Xtrans.c', 'Xtrans.h', 'Xtransint.h',
+                                                    'Xtranslcl.c', 'Xtranssock.c', 'Xtransutil.c']],
+    'dirs': [],
 }
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/x/xtrans/xtrans-1.3.5-goolf-1.5.14.eb b/easybuild/easyconfigs/x/xtrans/xtrans-1.3.5-goolf-1.5.14.eb
index 2286309947c83ef6ac915b760efacf0498dbfeb0..ed6733fd177ff0c029cb388803cac7309ef114b3 100644
--- a/easybuild/easyconfigs/x/xtrans/xtrans-1.3.5-goolf-1.5.14.eb
+++ b/easybuild/easyconfigs/x/xtrans/xtrans-1.3.5-goolf-1.5.14.eb
@@ -15,12 +15,9 @@ sources = [SOURCE_TAR_GZ]
 source_urls = [XORG_LIB_SOURCE]
 
 sanity_check_paths = {
-    'files' : ['include/X11/Xtrans/%s' % x for x in [
-        'transport.c', 'Xtrans.c', 'Xtrans.h', 'Xtransint.h', 'Xtranslcl.c',
-        'Xtranssock.c', 'Xtransutil.c'
-        ]
-    ],
-    'dirs' : []
+    'files': ['include/X11/Xtrans/%s' % x for x in ['transport.c', 'Xtrans.c', 'Xtrans.h', 'Xtransint.h',
+                                                    'Xtranslcl.c', 'Xtranssock.c', 'Xtransutil.c']],
+    'dirs': [],
 }
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/x/xtrans/xtrans-1.3.5-intel-2015a.eb b/easybuild/easyconfigs/x/xtrans/xtrans-1.3.5-intel-2015a.eb
index ef00169dc4f7f3dcad334ea7c782b674f3376d06..06135324979866d897f079bc3bc7e835bca53954 100644
--- a/easybuild/easyconfigs/x/xtrans/xtrans-1.3.5-intel-2015a.eb
+++ b/easybuild/easyconfigs/x/xtrans/xtrans-1.3.5-intel-2015a.eb
@@ -15,12 +15,9 @@ sources = [SOURCE_TAR_GZ]
 source_urls = [XORG_LIB_SOURCE]
 
 sanity_check_paths = {
-    'files' : ['include/X11/Xtrans/%s' % x for x in [
-        'transport.c', 'Xtrans.c', 'Xtrans.h', 'Xtransint.h', 'Xtranslcl.c',
-        'Xtranssock.c', 'Xtransutil.c'
-        ]
-    ],
-    'dirs' : []
+    'files': ['include/X11/Xtrans/%s' % x for x in ['transport.c', 'Xtrans.c', 'Xtrans.h', 'Xtransint.h',
+                                                    'Xtranslcl.c', 'Xtranssock.c', 'Xtransutil.c']],
+    'dirs': [],
 }
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/x/xtrans/xtrans-1.3.5-intel-2015b.eb b/easybuild/easyconfigs/x/xtrans/xtrans-1.3.5-intel-2015b.eb
index 94ae99a09d661c9e8f230eecb27abfc31067e31a..21b74f6cfeb96b8875287e8285e5ac8acab311c8 100644
--- a/easybuild/easyconfigs/x/xtrans/xtrans-1.3.5-intel-2015b.eb
+++ b/easybuild/easyconfigs/x/xtrans/xtrans-1.3.5-intel-2015b.eb
@@ -15,12 +15,9 @@ sources = [SOURCE_TAR_GZ]
 source_urls = [XORG_LIB_SOURCE]
 
 sanity_check_paths = {
-    'files' : ['include/X11/Xtrans/%s' % x for x in [
-        'transport.c', 'Xtrans.c', 'Xtrans.h', 'Xtransint.h', 'Xtranslcl.c',
-        'Xtranssock.c', 'Xtransutil.c'
-        ]
-    ],
-    'dirs' : []
+    'files': ['include/X11/Xtrans/%s' % x for x in ['transport.c', 'Xtrans.c', 'Xtrans.h', 'Xtransint.h',
+                                                    'Xtranslcl.c', 'Xtranssock.c', 'Xtransutil.c']],
+    'dirs': [],
 }
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/y/YAML-Syck/YAML-Syck-1.27-goolf-1.4.10-Perl-5.16.3.eb b/easybuild/easyconfigs/y/YAML-Syck/YAML-Syck-1.27-goolf-1.4.10-Perl-5.16.3.eb
index b409a46b6b073e54b56eef15e81180aeea9c4b24..04fcdaad37b693c3506404ababea2fc09e0faaac 100644
--- a/easybuild/easyconfigs/y/YAML-Syck/YAML-Syck-1.27-goolf-1.4.10-Perl-5.16.3.eb
+++ b/easybuild/easyconfigs/y/YAML-Syck/YAML-Syck-1.27-goolf-1.4.10-Perl-5.16.3.eb
@@ -24,7 +24,7 @@ sources = [SOURCE_TAR_GZ]
 perl = 'Perl'
 perlver = '5.16.3'
 perlverextra = ''
-versionsuffix = '-%s-%s%s' % (perl, perlver,perlverextra)
+versionsuffix = '-%s-%s%s' % (perl, perlver, perlverextra)
 
 dependencies = [
     (perl, perlver, perlverextra),
diff --git a/easybuild/easyconfigs/y/YAML-Syck/YAML-Syck-1.27-ictce-4.1.13-Perl-5.16.3.eb b/easybuild/easyconfigs/y/YAML-Syck/YAML-Syck-1.27-ictce-4.1.13-Perl-5.16.3.eb
index fa45b910fb7db23e18330645f3d502d658ac6cbd..814139aaa0a11e22b1788e690bfef34bbb42d813 100644
--- a/easybuild/easyconfigs/y/YAML-Syck/YAML-Syck-1.27-ictce-4.1.13-Perl-5.16.3.eb
+++ b/easybuild/easyconfigs/y/YAML-Syck/YAML-Syck-1.27-ictce-4.1.13-Perl-5.16.3.eb
@@ -24,7 +24,7 @@ sources = [SOURCE_TAR_GZ]
 perl = 'Perl'
 perlver = '5.16.3'
 perlverextra = ''
-versionsuffix = '-%s-%s%s' % (perl, perlver,perlverextra)
+versionsuffix = '-%s-%s%s' % (perl, perlver, perlverextra)
 
 dependencies = [
     (perl, perlver, perlverextra),
diff --git a/easybuild/easyconfigs/y/YAML-Syck/YAML-Syck-1.27-ictce-5.3.0-Perl-5.16.3.eb b/easybuild/easyconfigs/y/YAML-Syck/YAML-Syck-1.27-ictce-5.3.0-Perl-5.16.3.eb
index f2c952182bddd6e54a4a125e7fdd00956524c8c2..4816f11ffde9ba24fff14f92533d7e3eed70c406 100644
--- a/easybuild/easyconfigs/y/YAML-Syck/YAML-Syck-1.27-ictce-5.3.0-Perl-5.16.3.eb
+++ b/easybuild/easyconfigs/y/YAML-Syck/YAML-Syck-1.27-ictce-5.3.0-Perl-5.16.3.eb
@@ -24,7 +24,7 @@ sources = [SOURCE_TAR_GZ]
 perl = 'Perl'
 perlver = '5.16.3'
 perlverextra = ''
-versionsuffix = '-%s-%s%s' % (perl, perlver,perlverextra)
+versionsuffix = '-%s-%s%s' % (perl, perlver, perlverextra)
 
 dependencies = [
     (perl, perlver, perlverextra),
diff --git a/easybuild/easyconfigs/y/Yasm/Yasm-1.2.0-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/y/Yasm/Yasm-1.2.0-goalf-1.1.0-no-OFED.eb
index 44f8a5205cbf8f33b0ae067a401b38a31e135c6e..e2bfa1c5fb273575a4c291e337500a3e6f12c742 100644
--- a/easybuild/easyconfigs/y/Yasm/Yasm-1.2.0-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/y/Yasm/Yasm-1.2.0-goalf-1.1.0-no-OFED.eb
@@ -24,8 +24,8 @@ source_urls = ['http://www.tortall.net/projects/yasm/releases/']
 toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
 
 sanity_check_paths = {
-                      'files': ['bin/yasm'],
-                      'dirs': []
-                     }
+    'files': ['bin/yasm'],
+    'dirs': []
+}
 
 moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/y/Yasm/Yasm-1.2.0-ictce-4.0.6.eb b/easybuild/easyconfigs/y/Yasm/Yasm-1.2.0-ictce-4.0.6.eb
index 592b6f211789f5bd332ff5c7374c2c4ece53132d..5b66cf87a7385755250cf7a76bd86a4242eff1b9 100644
--- a/easybuild/easyconfigs/y/Yasm/Yasm-1.2.0-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/y/Yasm/Yasm-1.2.0-ictce-4.0.6.eb
@@ -24,8 +24,8 @@ source_urls = ['http://www.tortall.net/projects/yasm/releases/']
 toolchain = {'version': '4.0.6', 'name': 'ictce'}
 
 sanity_check_paths = {
-                      'files': ['bin/yasm'],
-                      'dirs': []
-                     }
+    'files': ['bin/yasm'],
+    'dirs': []
+}
 
 moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/y/Yasm/Yasm-1.2.0-ictce-5.3.0.eb b/easybuild/easyconfigs/y/Yasm/Yasm-1.2.0-ictce-5.3.0.eb
index ab7055fa1c2f9e3b8afb94c1373e0cdad4662819..a98dbc5915ec7690c85d7d91bbdf6293f99d5b64 100644
--- a/easybuild/easyconfigs/y/Yasm/Yasm-1.2.0-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/y/Yasm/Yasm-1.2.0-ictce-5.3.0.eb
@@ -25,8 +25,8 @@ source_urls = ['http://www.tortall.net/projects/yasm/releases/']
 toolchain = {'name': 'ictce', 'version': '5.3.0'}
 
 sanity_check_paths = {
-                      'files': ['bin/yasm'],
-                      'dirs': []
-                     }
+    'files': ['bin/yasm'],
+    'dirs': []
+}
 
 moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/y/Yasm/Yasm-1.3.0-foss-2015a.eb b/easybuild/easyconfigs/y/Yasm/Yasm-1.3.0-foss-2015a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..90c83cfb4e7c3a8cb26ee9630c567d4355c747b9
--- /dev/null
+++ b/easybuild/easyconfigs/y/Yasm/Yasm-1.3.0-foss-2015a.eb
@@ -0,0 +1,31 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2012-2014 Uni.Lu/LCSB, NTUA
+# Authors::   Fotis Georgatos <fotis@cern.ch>
+# License::   MIT/GPL
+# $Id$
+#
+# This work implements a part of the HPCBIOS project and is a component of the policy:
+# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-90.html
+##
+
+easyblock = 'ConfigureMake'
+
+name = 'Yasm'
+version = '1.3.0'
+
+homepage = 'http://www.tortall.net/projects/yasm/'
+description = """Yasm: Complete rewrite of the NASM assembler with BSD license"""
+
+toolchain = {'name': 'foss', 'version': '2015a'}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://www.tortall.net/projects/yasm/releases/']
+
+sanity_check_paths = {
+    'files': ['bin/yasm'],
+    'dirs': [],
+}
+
+moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/y/Yasm/Yasm-1.3.0-gimkl-2.11.5.eb b/easybuild/easyconfigs/y/Yasm/Yasm-1.3.0-gimkl-2.11.5.eb
new file mode 100644
index 0000000000000000000000000000000000000000..b2b7c412d9ad8e5c93c9ec279e6755bba714efe0
--- /dev/null
+++ b/easybuild/easyconfigs/y/Yasm/Yasm-1.3.0-gimkl-2.11.5.eb
@@ -0,0 +1,31 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2012-2014 Uni.Lu/LCSB, NTUA
+# Authors::   Fotis Georgatos <fotis@cern.ch>
+# License::   MIT/GPL
+# $Id$
+#
+# This work implements a part of the HPCBIOS project and is a component of the policy:
+# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-90.html
+##
+
+easyblock = 'ConfigureMake'
+
+name = 'Yasm'
+version = '1.3.0'
+
+homepage = 'http://www.tortall.net/projects/yasm/'
+description = """Yasm: Complete rewrite of the NASM assembler with BSD license"""
+
+toolchain = {'name': 'gimkl', 'version': '2.11.5'}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://www.tortall.net/projects/yasm/releases/']
+
+sanity_check_paths = {
+    'files': ['bin/yasm'],
+    'dirs': [],
+}
+
+moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/y/Yasm/Yasm-1.3.0-intel-2016a.eb b/easybuild/easyconfigs/y/Yasm/Yasm-1.3.0-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..b5dae689242788d8205f1fbd757094f35fd95ad2
--- /dev/null
+++ b/easybuild/easyconfigs/y/Yasm/Yasm-1.3.0-intel-2016a.eb
@@ -0,0 +1,31 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2012-2014 Uni.Lu/LCSB, NTUA
+# Authors::   Fotis Georgatos <fotis@cern.ch>
+# License::   MIT/GPL
+# $Id$
+#
+# This work implements a part of the HPCBIOS project and is a component of the policy:
+# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-90.html
+##
+
+easyblock = 'ConfigureMake'
+
+name = 'Yasm'
+version = '1.3.0'
+
+homepage = 'http://www.tortall.net/projects/yasm/'
+description = """Yasm: Complete rewrite of the NASM assembler with BSD license"""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://www.tortall.net/projects/yasm/releases/']
+
+sanity_check_paths = {
+    'files': ['bin/yasm'],
+    'dirs': [],
+}
+
+moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-4.1.4-foss-2015a.eb b/easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-4.1.4-foss-2015a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..344b95ebc3e62eba111621d94e2024cce2156657
--- /dev/null
+++ b/easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-4.1.4-foss-2015a.eb
@@ -0,0 +1,35 @@
+easyblock = 'ConfigureMake'
+
+name = 'ZeroMQ'
+version = '4.1.4'
+
+homepage = 'http://www.zeromq.org/'
+description = """ZeroMQ looks like an embeddable networking library but acts like a concurrency framework.
+ It gives you sockets that carry atomic messages across various transports like in-process,
+ inter-process, TCP, and multicast. You can connect sockets N-to-N with patterns like fanout,
+ pub-sub, task distribution, and request-reply. It's fast enough to be the fabric for clustered
+ products. Its asynchronous I/O model gives you scalable multicore applications, built as asynchronous
+ message-processing tasks. It has a score of language APIs and runs on most operating systems."""
+
+toolchain = {'name': 'foss', 'version': '2015a'}
+
+source_urls = ['http://download.zeromq.org/']
+sources = [SOURCELOWER_TAR_GZ]
+
+# --with-pgm will use shipped OpenPGM (in foreign subdir)
+configopts = '--with-pic --with-system-pgm '
+configopts += 'OpenPGM_CFLAGS="-I$EBROOTOPENPGM/include/pgm-${EBVERSIONOPENPGM%.*}" '
+configopts += 'OpenPGM_LIBS="-L$EBROOTOPENPGM/lib -lpgm -lrt -lpthread -lm" '
+
+dependencies = [
+    ('OpenPGM', '5.2.122'),
+    ('util-linux', '2.27.1'),
+    ('libsodium', '1.0.8'),
+]
+
+sanity_check_paths = {
+    'files': ['lib/libzmq.so', 'lib/libzmq.a'],
+    'dirs': ['include', 'lib'],
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/z/zsh/zsh-5.0.2-goolf-1.4.10.eb b/easybuild/easyconfigs/z/zsh/zsh-5.0.2-goolf-1.4.10.eb
index f585c174c3956259c7a92d9164341a952e2b081a..1b0f601684e411141755c48f641508b05a515ded 100644
--- a/easybuild/easyconfigs/z/zsh/zsh-5.0.2-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/z/zsh/zsh-5.0.2-goolf-1.4.10.eb
@@ -6,7 +6,7 @@ version = '5.0.2'
 homepage = 'http://www.zsh.org/'
 description = "Zsh is a shell designed for interactive use, although it is also a powerful scripting language."
 
-toolchain = {'name':'goolf', 'version': '1.4.10'}
+toolchain = {'name': 'goolf', 'version': '1.4.10'}
 
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = ['http://prdownloads.sourceforge.net/%(namelower)s']
diff --git a/easybuild/easyconfigs/z/zsh/zsh-5.0.2-ictce-4.1.13.eb b/easybuild/easyconfigs/z/zsh/zsh-5.0.2-ictce-4.1.13.eb
index 72db46c65f0bb3f1918ab69e81e9854d433b4103..14216f20094277b46d7d39231a4f8d33af5346f8 100644
--- a/easybuild/easyconfigs/z/zsh/zsh-5.0.2-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/z/zsh/zsh-5.0.2-ictce-4.1.13.eb
@@ -6,7 +6,7 @@ version = '5.0.2'
 homepage = 'http://www.zsh.org/'
 description = "Zsh is a shell designed for interactive use, although it is also a powerful scripting language."
 
-toolchain = {'name':'ictce', 'version': '4.1.13'}
+toolchain = {'name': 'ictce', 'version': '4.1.13'}
 
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = ['http://prdownloads.sourceforge.net/%(namelower)s']
diff --git a/easybuild/easyconfigs/z/zsync/zsync-0.6.2-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/z/zsync/zsync-0.6.2-goalf-1.1.0-no-OFED.eb
index 35d2652e6207416b5753b2e9b2f45d940d228a35..b70a682d96ccb217efb75557d3537095d84b994f 100644
--- a/easybuild/easyconfigs/z/zsync/zsync-0.6.2-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/z/zsync/zsync-0.6.2-goalf-1.1.0-no-OFED.eb
@@ -24,8 +24,8 @@ source_urls = ['http://zsync.moria.org.uk/download/']
 toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
 
 sanity_check_paths = {
-                      'files': ['bin/zsync'],
-                      'dirs': []
-                     }
+    'files': ['bin/zsync'],
+    'dirs': []
+}
 
 moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/z/zsync/zsync-0.6.2-ictce-4.0.6.eb b/easybuild/easyconfigs/z/zsync/zsync-0.6.2-ictce-4.0.6.eb
index 406951135bba5fa94653b3340c48cd98037579bb..9a77005cb584bd2b9f755e8899bb953f91b55920 100644
--- a/easybuild/easyconfigs/z/zsync/zsync-0.6.2-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/z/zsync/zsync-0.6.2-ictce-4.0.6.eb
@@ -24,8 +24,8 @@ source_urls = ['http://zsync.moria.org.uk/download/']
 toolchain = {'version': '4.0.6', 'name': 'ictce'}
 
 sanity_check_paths = {
-                      'files': ['bin/zsync'],
-                      'dirs': []
-                     }
+    'files': ['bin/zsync'],
+    'dirs': []
+}
 
 moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/z/zsync/zsync-0.6.2-ictce-5.3.0.eb b/easybuild/easyconfigs/z/zsync/zsync-0.6.2-ictce-5.3.0.eb
index d72b794ff171ae0f416a46f2ac88655e41ef1a32..960ac2460a460377578f5c7fdb7e735c0e2e62ee 100644
--- a/easybuild/easyconfigs/z/zsync/zsync-0.6.2-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/z/zsync/zsync-0.6.2-ictce-5.3.0.eb
@@ -25,8 +25,8 @@ source_urls = ['http://zsync.moria.org.uk/download/']
 toolchain = {'name': 'ictce', 'version': '5.3.0'}
 
 sanity_check_paths = {
-                      'files': ['bin/zsync'],
-                      'dirs': []
-                     }
+    'files': ['bin/zsync'],
+    'dirs': []
+}
 
 moduleclass = 'tools'
diff --git a/setup.py b/setup.py
index fecf0103637f5d0e0468be14bf15036b97f2fbb6..e1abe096bf78a096b6a3558edba05ece25d669ef 100644
--- a/setup.py
+++ b/setup.py
@@ -1,11 +1,11 @@
 ##
-# Copyright 2012-2015 Ghent University
+# Copyright 2012-2016 Ghent University
 #
 # This file is part of EasyBuild,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
 # with support of Ghent University (http://ugent.be/hpc),
 # the Flemish Supercomputer Centre (VSC) (https://vscentrum.be/nl/en),
-# the Hercules foundation (http://www.herculesstichting.be/in_English)
+# Flemish Research Foundation (FWO) (http://www.fwo.be/en)
 # and the Department of Economy, Science and Innovation (EWI) (http://www.ewi-vlaanderen.be/en).
 #
 # http://github.com/hpcugent/easybuild
diff --git a/test/__init__.py b/test/__init__.py
index c4b9363e8a7552058ed8435efc500926e9528490..856f7e41786601692b5b4c2b61365f2a87793e75 100644
--- a/test/__init__.py
+++ b/test/__init__.py
@@ -5,7 +5,7 @@
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
 # with support of Ghent University (http://ugent.be/hpc),
 # the Flemish Supercomputer Centre (VSC) (https://vscentrum.be/nl/en),
-# the Hercules foundation (http://www.herculesstichting.be/in_English)
+# Flemish Research Foundation (FWO) (http://www.fwo.be/en)
 # and the Department of Economy, Science and Innovation (EWI) (http://www.ewi-vlaanderen.be/en).
 #
 # http://github.com/hpcugent/easybuild
diff --git a/test/easyconfigs/easyconfigs.py b/test/easyconfigs/easyconfigs.py
index d77b78e436012b246172efa33d1748c58753927f..f3b329c87239c9d63d070d9f13ed67a08f1bfdc6 100644
--- a/test/easyconfigs/easyconfigs.py
+++ b/test/easyconfigs/easyconfigs.py
@@ -5,7 +5,7 @@
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
 # with support of Ghent University (http://ugent.be/hpc),
 # the Flemish Supercomputer Centre (VSC) (https://vscentrum.be/nl/en),
-# the Hercules foundation (http://www.herculesstichting.be/in_English)
+# Flemish Research Foundation (FWO) (http://www.fwo.be/en)
 # and the Department of Economy, Science and Innovation (EWI) (http://www.ewi-vlaanderen.be/en).
 #
 # http://github.com/hpcugent/easybuild
@@ -338,19 +338,21 @@ def template_easyconfig_test(self, spec):
 
 def suite():
     """Return all easyblock initialisation tests."""
-
-    # dynamically generate a separate test for each of the available easyblocks
-    easyconfigs_path = get_paths_for("easyconfigs")[0]
-    specs = glob.glob('%s/*/*/*.eb' % easyconfigs_path)
-
-    for spec in specs:
-        # dynamically define new inner functions that can be added as class methods to InitTest
-        exec("def innertest(self): template_easyconfig_test(self, '%s')" % spec)
-        spec = os.path.basename(spec)
-        innertest.__doc__ = "Test for parsing of easyconfig %s" % spec
-        innertest.__name__ = "test__parse_easyconfig_%s" % spec  # double underscore so parsing tests are run first
-        setattr(EasyConfigTest, innertest.__name__, innertest)
-
+    # dynamically generate a separate test for each of the available easyconfigs
+    # define new inner functions that can be added as class methods to InitTest
+    easyconfigs_path = get_paths_for('easyconfigs')[0]
+    cnt = 0
+    for (subpath, _, specs) in os.walk(easyconfigs_path, topdown=True):
+        for spec in specs:
+            if spec.endswith('.eb') and spec != 'TEMPLATE.eb':
+                cnt += 1
+                exec("def innertest(self): template_easyconfig_test(self, '%s')" % os.path.join(subpath, spec))
+                innertest.__doc__ = "Test for parsing of easyconfig %s" % spec
+                # double underscore so parsing tests are run first
+                innertest.__name__ = "test__parse_easyconfig_%s" % spec
+                setattr(EasyConfigTest, innertest.__name__, innertest)
+
+    print "Found %s easyconfigs..." % cnt
     return TestLoader().loadTestsFromTestCase(EasyConfigTest)
 
 if __name__ == '__main__':
diff --git a/test/easyconfigs/suite.py b/test/easyconfigs/suite.py
index 6afbd6ffb15accfe319e11c510c9e60e6131d8ba..79a1fb0d085fb6c8abcf74f714b697dddabe1c88 100644
--- a/test/easyconfigs/suite.py
+++ b/test/easyconfigs/suite.py
@@ -6,7 +6,7 @@
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
 # with support of Ghent University (http://ugent.be/hpc),
 # the Flemish Supercomputer Centre (VSC) (https://vscentrum.be/nl/en),
-# the Hercules foundation (http://www.herculesstichting.be/in_English)
+# Flemish Research Foundation (FWO) (http://www.fwo.be/en)
 # and the Department of Economy, Science and Innovation (EWI) (http://www.ewi-vlaanderen.be/en).
 #
 # http://github.com/hpcugent/easybuild