Merge remote-tracking branch 'origin/gh-pages' into cc

.ruby-version

@@ -0,0 +1 @@
+2.0.0

.travis.yml

@@ -5,4 +5,4 @@ script: "./script/cibuild"
 #environment
 language: ruby
 rvm: 
-  - 1.9.3
+  - 2.0.0

Gemfile

@@ -1,3 +1,4 @@
 source 'https://rubygems.org'
+ruby File.read('.ruby-version').strip
 
 gem "github-pages"

Gemfile.lock

@@ -9,7 +9,7 @@ GEM
       highline (~> 1.6.11)
     directory_watcher (1.4.1)
     fast-stemmer (1.0.2)
-    github-pages (1)
+    github-pages (4)
       RedCloth (= 4.2.9)
       jekyll (= 1.1.2)
       kramdown (= 1.0.2)

_config.yml

@@ -1,6 +1,6 @@
 title: ChooseALicense.com
 relative_permalinks: false
-markdown: redcarpet
+markdown: kramdown
 
 rules:
 

about.md

@@ -11,9 +11,13 @@ If you already know what you’re doing and have a license you prefer to use
 
 ## Not comprehensive
 
-This site is not a comprehensive directory of open source licenses. If you&#8217;re looking for a comprehensive list, we recommend the <a href="http://opensource.org/licenses/">Open Source Initiative</a> website.
+This site is not a comprehensive directory of open source licenses.  We think there are too many options, which adds to the confusion. On the homepage, we break it down into just three licenses. The vast majority of projects will likely be fine choosing from one of these three. Just in case you have specific needs not covered by those three, we also highlight a [few other licenses to consider](/licenses/).  Additional resources:
 
-We think there are too many options, which adds to the confusion. On the homepage, we break it down into just three licenses. The vast majority of projects will likely be fine choosing from one of these three. Just in case you have specific needs not covered by those three, we also highlight a [few other licenses to consider](/licenses/).
+* [Open Source Initiative](http://opensource.org/licenses/) - comprehensive list of open source licenses
+* [Comparison of free and open-source software licenses](http://en.wikipedia.org/wiki/Comparison_of_free_and_open-source_software_licenses) on Wikipedia
+* [License differentiator](http://www.oss-watch.ac.uk/apps/licdiff/) from [OSS Watch](http://www.oss-watch.ac.uk/)
+* [TLDRLegal](http://www.tldrlegal.com/)
+{: .bullets}
 
 ## Help us improve it
 

javascripts/app.js

@@ -1,9 +1,8 @@
-// Generated by CoffeeScript 1.4.0
+// Generated by CoffeeScript 1.6.3
 (function() {
   var Choosealicense;
 
   Choosealicense = (function() {
-
     Choosealicense.prototype.flashAvailable = function() {
       if (typeof ActiveXObject !== "undefined" && ActiveXObject !== null) {
         return !!(new ActiveXObject('ShockwaveFlash.ShockwaveFlash'));