Merge branch 'rtl_via_css_flip' of github.com:twbs/bootstrap into rtl_via_css_flip

Conflicts:
	Gruntfile.js
	package.json
	test-infra/npm-shrinkwrap.canonical.json

diff --cc Gruntfile.js
Simple merge

diff --cc package.json
index 9610cc1d4e7c4e63f3004d64304244a984a6bc0b,2e718eae2247afc8799dce88d2e75d664f8fdd2a..6b1673b85941b1ae6b5cc7b7e642cc55c22aa276
--- 1/package.json
--- 2/package.json
+++ b/package.json
@@@ -31,20 -26,21 +31,21 @@@
    },
    "devDependencies": {
      "btoa": "~1.1.1",
 -    "canonical-json": "~0.0.3",
 +    "canonical-json": "~0.0.4",
+     "css-flip": "~0.3.0",
      "grunt": "~0.4.2",
 -    "grunt-banner": "~0.2.0",
 +    "grunt-banner": "~0.2.1",
      "grunt-contrib-clean": "~0.5.0",
      "grunt-contrib-concat": "~0.3.0",
 -    "grunt-contrib-connect": "~0.7.0",
 +    "grunt-contrib-connect": "~0.7.1",
      "grunt-contrib-copy": "~0.5.0",
      "grunt-contrib-csslint": "~0.2.0",
 -    "grunt-contrib-cssmin": "~0.8.0",
 +    "grunt-contrib-cssmin": "~0.9.0",
      "grunt-contrib-jade": "~0.10.0",
      "grunt-contrib-jshint": "~0.8.0",
 -    "grunt-contrib-less": "~0.9.0",
 +    "grunt-contrib-less": "~0.10.0",
      "grunt-contrib-qunit": "~0.4.0",
 -    "grunt-contrib-uglify": "~0.3.0",
 +    "grunt-contrib-uglify": "~0.4.0",
      "grunt-contrib-watch": "~0.5.3",
      "grunt-csscomb": "~2.0.1",
      "grunt-exec": "~0.4.5",