Recreated features/intertwine_layout_2013/. I think this puts us back to what we had before I messed it up yesterday.