Updates for layouts and marionette
Merge branch 'master' of github.com:TriangleIL/bPi