More base changes to prepare for switch to Foundation/Sass