layout + theme
Merge branch 'master' of github.com:aronj/aronj.github.com