clean-up + add elelinux
Merge remote-tracking branch 'origin/jb' into jb