Merge branch 'master' into gh-pages
Updates

Update slider buttons / sprite sheet for social icons
Merge branch 'gh-pages'