Add Cairo 1.12.18 for intel/2014b
Add gnuplot 4.6.6 with cairo
Deleted wrong easyconfig
Fix cairo bug
Merge branch 'develop' into gnuplot

* develop: (62 commits)
  fix typo in patch filename
  add easyconfig for ctffind v4.0.8 with intel/2014b
  style fixes in ctffind v140609 easyconfigs
  OpenSSL optional dependency (commented out)
  Empty lines deleted
  Update Kerberos_V5-1.12.2-intel-2014b.eb
  rainling whitespaces removed
  add -wd175 to $CFLAGS to disable error when building binutils with Intel compilers
  also fix wiktor.jurkowski@tgac.ac.uk
  be fair about where NTUA is listed
  fix Valgrind header, too
  2012-2014
  Uni.Lu/LCSB, NTUA
  fotis@cern.ch
  style fixes
  add buildopts to make sure right compiler is used
  Dependencies in separate lines
  Dependencies in separate lines
  Dependencies in separate lines
  add easyconfig for BEDTools v2.22.0 with intel/2014b
  ...

Conflicts:
	easybuild/easyconfigs/f/fontconfig/fontconfig-2.11.1-intel-2014b.eb
Merge branch 'develop' into gnuplot

* develop: (62 commits)
  only set $EASYBUILD_DEPRECATED for Python 2.6 and up
  add patch to fix broken test in Go
  fixed versionsuffix
  renamed as @boegel suggested
  switched makeopts to buildopts
  switched to $CFLAGS as @boegel suggested
  new Velvet easyconfigs
  added download url. Fixed sanity check
  Chimera easyconfig
  add easyblock = 'ConfigureMake' in Szip easyconfig file
  fix CLHEP by adding -gcc to $CXXFLAGS
  explicitely specify ConfigureMake easyblock, automagic fallback is deprecated
  enable triggering errors on use of deprecated functionality by defining $EASYBUILD_DEPRECATED prior to initialising the EasyBuild configuration
  stop using deprecated 'makeopts', 'premakeopts' and 'shared_lib_ext'
  add easyblock = 'ConfigureMake' to popt easyconfig where it's missing
  add easyblock = 'ConfigureMake' to easyconfigs where it's missing (bis)
  fix screwup in GLib easyconfig filename
  improve error message on automagic fallback to ConfigureMake
  add easyconfig for HDF5 v1.8.7 with gmpolf/1.4.8
  add easyblock = 'ConfigureMake' to easyconfigs where it's missing
  ...

Conflicts:
	easybuild/easyconfigs/c/cairo/cairo-1.12.18-intel-2014b.eb
	easybuild/easyconfigs/p/pixman/pixman-0.32.6-intel-2014b.eb
Add easyblock parameter
Merge pull request #1231 from wpoely86/gnuplot

gnuplot 4.6.6 + cairo