Merge in layout, resolve conflicts
Merge branch 'master' of github.com:sikora/siac