Some bugfixes to the layout module (more to come).
Merge branch 'master' of http://github.com/Grissess/Mindscape