updates as per pull request requirements, Bourbon and Neat support