Merge branch 'develop' into RELION

Conflicts:
	easybuild/easyconfigs/b/bzip2/bzip2-1.0.6-foss-2014b.eb
	easybuild/easyconfigs/f/FFTW/FFTW-3.3.4-gompi-2014b.eb
	easybuild/easyconfigs/f/FFTW/FFTW-3.3.4-intel-2014b.eb
	easybuild/easyconfigs/i/inputproto/inputproto-2.3-intel-2014b.eb
	easybuild/easyconfigs/k/kbproto/kbproto-1.0.6-intel-2014b.eb
	easybuild/easyconfigs/l/libXau/libXau-1.0.8-intel-2014b.eb
	easybuild/easyconfigs/l/libreadline/libreadline-6.3-foss-2014b.eb
	easybuild/easyconfigs/n/ncurses/ncurses-5.9-foss-2014b.eb
	easybuild/easyconfigs/p/Python/Python-2.7.8-foss-2014b.eb
	easybuild/easyconfigs/x/xtrans/xtrans-1.3.4-intel-2014b.eb
	easybuild/easyconfigs/z/zlib/zlib-1.2.8-foss-2014b.eb