Stop committing the el-get geez
Merge fixes