Added real config file to .gitignore
Merge branch 'master' into devel