Merge pull request #2 from skanct/fix-gitignore

Fixes leftovers from merge conflict
Merge branch 'master' into add-support-for-travis-ci