Merge branch 'master' into 1233-local

Conflicts:
	lib/linguist/language.rb
	lib/linguist/languages.yml
	lib/linguist/samples.json

.travis.yml

@@ -1,13 +1,12 @@
 before_install:
   - git fetch origin master:master
   - git fetch origin v2.0.0:v2.0.0
+  - git fetch origin test/attributes:test/attributes
   - sudo apt-get install libicu-dev -y
-  - gem update --system 2.1.11
-before_script:
-  - bundle exec rake samples
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.1
+  - 2.1
+  - 2.2
 notifications:
   disabled: true