Merge branch 'layout_spacing' of git://github.com/Elv13/awesome-1