fix #13979
doc that you can't use both data-ride and $().carousel() on the same carousel; fixes #13896

[skip sauce]
Fix inconsistency between demo and displayed code for modal demo

Fixes #13991
Merge pull request #13992 from pjrobertson/master

Fix inconsistency between demo and displayed code for modal demo
Update dependencies.
fix #13964
Merge pull request #13993 from twbs/fix-13964

Fix #13964
Merge pull request #13988 from twbs/fix-13896

doc that you can't use both data-ride and $().carousel() on the same carousel