2014a

Merging master back in this branch + a fix for the conflicts (https://github.com/JensTimmerman/easybuild-easyconfigs/commit/5ceb037fc3b7337eef6f5b88f977c55dc7dd5bd9)

This should make https://github.com/hpcugent/easybuild-easyconfigs/pull/774 mergable