fixing height of menu-and-content, slight organizational tweaks
updating vagrant
Merge branch 'phil-styling' into testing