layout and stuff
Merge branch 'master' of http://github.com/grav/petulant-octo-adventure