made updates to user/edit. Have some cukes failing but have to take a brake
removed data-no-turbolink from YouTube button
reverted stories
fixed two failing cukes
merged with latest thomas/fixes
removed @webkit
cukes now passing
Merge pull request #291 from yggie/fix-for-youtube

YouTube
Cached Home Page
changes to social_button class to pass in extra css
fixed conflicts after merge
Merge pull request #292 from tochman/fixes

UI Fixes
removed data-no-turbolink again
added test to ensure no data-no-turbolink attribute is around the youtube button
Merge pull request #295 from yggie/develop

Fix YouTube bug again
Merge branch 'develop' of https://github.com/sampritipanda/WebsiteOne into optimization