adding travis
Merge pull request #36 from eigilsagafos/more_capybara

adding travis
fixed merge fonflict in Gemfile.lock