Merge branch 'gh-pages' of git://github.com/thomaspark/bootswatch int…

…o gh-pages

Conflicts:
	amelia/index.html
	cerulean/index.html
	cosmo/index.html
	cyborg/index.html
	default/index.html
	index.html
	journal/index.html
	readable/index.html
	simplex/index.html
	slate/index.html
	spacelab/index.html
	spruce/index.html
	superhero/index.html
	united/index.html

Gruntfile.js

@@ -16,7 +16,7 @@ module.exports = function (grunt) {
 						' * @license <%= pkg.license %>' + ' */'
 		},
 		swatch: {
-			amelia:{}, cerulean:{}, cosmo:{}, cyborg:{}, journal:{}, readable:{},
+			amelia:{}, cerulean:{}, cosmo:{}, cyborg:{}, flatly:{}, journal:{}, readable:{},
 			simplex:{}, slate:{}, spacelab:{}, spruce:{}, superhero:{}, united:{}
 		},
 		clean: {

README.md

@@ -9,14 +9,14 @@ Head over to [Bootswatch](http://bootswatch.com) and download the `bootstrap.min
 
 The themes are also hosted on [BootstrapCDN](http://www.bootstrapcdn.com/).
 
-For use with Rails, check out [bootswatch-rails](https://github.com/maxim/bootswatch-rails) (Sass) and [twitter-bootswatch-rails](https://github.com/scottvrosenthal/twitter-bootswatch-rails) (LESS).
+For use with Rails, check out [bootswatch-rails](https://github.com/maxim/bootswatch-rails) (Sass) and [twitter-bootswatch-rails](https://github.com/scottvrosenthal/twitter-bootswatch-rails) (LESS). For use with a Yeoman app or with Bower check out [bootswatch-scss](https://github.com/nrub/bootswatch-scss).
 
 
 Customization
 ------
 Bootswatch is an open source project, and you’re welcome to modify the themes further. If you’re interested, fork or follow the GitHub repository. The files of interest are in the `gh-pages` branch.
 
-Each raw theme consists of two LESS files. One is `variables.less`, which is included by default in Bootstrap and allows you to customize [these settings](http://twitter.github.com/bootstrap/less.html#variables). The other is called `bootswatch.less` and introduces more extensive structural changes.
+Each raw theme consists of two LESS files. One is `variables.less`, which is included by default in Bootstrap and allows you to customize [these settings](http://twitter.github.io/bootstrap/customize.html#variables). The other is called `bootswatch.less` and introduces more extensive structural changes.
 
 Check out the README in the [swatchmaker directory](https://github.com/thomaspark/bootswatch/tree/master/swatchmaker) for step-by-step instructions on building your own swatch.
 
@@ -60,4 +60,4 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use
 
 http://www.apache.org/licenses/LICENSE-2.0
 
-Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
+Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.