Lots of changes...
Implement proper enable/disable for some features
It was a bit excessive...
Update .gitignore
We are finally useable again
Merge branch 'origin/testing'