Removed all references to simplelayout and replaced them with spacedlayout.
Merge branch 'master' of github.com:teem2/dreem