Add disklayout (just squeeze for now)
Merge remote-tracking branch 'GregSutcliffe/master'

* GregSutcliffe/master:
  Add disklayout (just squeeze for now)