sync with develop & resolve conflict

Merge branch 'protobuf302foss2016a' of github.com:rug-cit-ris/easybuild-easyconfigs into protobuf302foss2016a

- versionsuffix
- removed check for __init__.py in egg directory
- check for site-packages directory instead
- removed check for bin directory as it does not contain important files

protobuf includes libraries, compiling it with the compiler from
a toolchain seems better.

protobuf includes libraries, compiling it with the compiler from
a toolchain seems better.

{tools}[dummy/,intel/2016b] hanythingondemand v3.1.4, hanythingondemand v3.1.4

add easyconfig hanythingondemand-3.1.4-cli.eb, add easyconfig hanythingondemand-3.1.4-intel-2016b-Python-2.7.12.eb

{bio}[intel/2016b] GRIT v2.0.5

stick to matplotlib 1.5.1 in scikit-learn, for compatibility with other Python modules

make sure EasyBuild is in full control over optimization flags in Blender easyconfig

{bio}[intel/2016b] SimVascular v2.16.0406