Merge branch '20160513141133_new_pr_tvb-data20160209' of github.com:boegel/easybuild-easyconfigs into 20160513141133_new_pr_tvb-data20160209