consolidated context
ignore x-* files
All scripts use the same context
Merge branch 'development'