Merge develop branch for salt projects
Removed byobu configs