added vim specific settins to .gitignore
Merge branch 'develop'