Updated to new version of Bourbon and Neat