reverted to last partially working directory and added capybara specific file
Merging change