Bourbon not required, so removed mention from main scss file
Added todo
Reorganised margin variable declarations to be more efficient