Merge pull request #47 from n4kz/master

Use `wincmd w` for <C-Space> called from master window
Autocommands for automatic layout updates