made updates to user/edit. Have some cukes failing but have to take a brake
reverted stories
fixed two failing cukes
merged with latest thomas/fixes
removed @webkit
cukes now passing
changes to social_button class to pass in extra css
fixed conflicts after merge
Merge pull request #292 from tochman/fixes

UI Fixes