fix merge conflict in story view
Add capybara fix to env.rb
fix and more properly word edit story feature
cleanup stylesheet files