Merge branch 'hotfix/python-extra-qualifications'
Added a .gitignore for directories, c++, python and matlab... also trying out this pull request on something rather benign
Merge branch 'storrgie-master' into develop