hopefully fixed social wrapping
social icons should be fixed for wraping
fixed merge conflicts, john are you not running gulp?