Definitely need to get rid of el-get as a member of my el-get-sources - init failed because of this today
Merge branch 'jn-big' into new-master