Ignore .touchpaperrc if it should happen to be accidentally added...
Merge branch 'master' into feature/configurable-tags
Finalising configurable tags integration