Modified gitignore
Merge with grixxly
Support for both versions