Updated openbox config
Merge branch 'master' into cobalt
Updated .xinitrc on cobalt