update to use newest version of bourbon, use proper mixins