Fix merge conflicts. Added custom retina suffix.
Fix merge conflicts. Added custom retina suffix.

mindeavor/bourbon,Nikeshsuwal/bourbon,nickg33/bourbon,chriseppstein/bourbon,mindeavor/bourbon,zyj1022/bourbon,jasonwalkow/bourbon,smithdamen/bourbon,setie/bourbon,nickg33/bourbon,greyhwndz/bourbon,Jazz-Man/bourbon,craftsmen/bourbon,Jazz-Man/bourbon,smithdamen/bourbon,jamesmenera/bourbon-libsass,craftsmen/bourbon,thoughtbot/bourbon,nagyistoce/sass-bourbon.io,greyhwndz/bourbon,zyj1022/bourbon,jasonwalkow/bourbon,cllns/bourbon,chriseppstein/bourbon,jamadam/bourbon-docs-jp,jamadam/bourbon-docs-jp,jamesmenera/bourbon-libsass,ismarkunc/bourbon,setie/bourbon,jamadam/bourbon-docs-jp,thoughtbot/bourbon,san650/bourbon,jamadam/bourbon-docs-jp