Fixed bootstrap JS
Merge branch 'master' of github.com:martafonda/makeyourtrip into deploy
Removed capybara