Merge pull request #9 from ambercouch/master

Layout pull in master changes
content-area 3/4 and side-bar 1/4 layout
Merge pull request #10 from ambercouch/layout

Layout