Apply git changes
Mess with ignore files & fix warnings
More gitignore stuff