Run test against latest Ruby 2.1 on Travis CI

see: https://twitter.com/travisci/status/513233940442644480
Run test against Ruby 2.2 on Travis CI
Use yajl since it is already a dependency

Both JSON and Yajl were listed as dependencies. Pygments.rb already requires yajl, so let's just use that instead of using both.
Add build.xml.dist to XML filenames
Heuristic rule to detect AsciiDoc files
that new green shell
its always greener
Merge pull request #1650 from github/greenshell

That new green shell, fixes #1640
Merge remote-tracking branch 'origin/master' into tricknotes-ruby-22

* origin/master: (51 commits)
  its always greener
  that new green shell
  Removing stale extension
  Update README.md
  Add moon interpreter for MoonScript
  Bumping version for 3.4.1 release
  Use text.html.erb scope for HTML+ERB files
  Add sample .dyalog file for file type APL
  Added extra Papyrus sample files.
  Add sample Papyrus script
  Add Papyrus support
  Add LOLCODE support
  Add ProGuard config files to vendored files
  Recognise *.dyalog as APL sources
  Assign a bunch more TextMate scopes
  CI step for samples
  Add .command as a Shell file extension
  CI config
  Vendored gems
  Update cibuild
  ...

Conflicts:
	Gemfile
Merge pull request #1620 from unfunco/ant-build-dist-support

Add build.xml.dist to XML filenames
Merge remote-tracking branch 'origin/master' into just-yajl

* origin/master: (42 commits)
  its always greener
  that new green shell
  Removing stale extension
  Update README.md
  Add moon interpreter for MoonScript
  Bumping version for 3.4.1 release
  Use text.html.erb scope for HTML+ERB files
  Add sample .dyalog file for file type APL
  Added extra Papyrus sample files.
  Add sample Papyrus script
  Add Papyrus support
  Add LOLCODE support
  Add ProGuard config files to vendored files
  Recognise *.dyalog as APL sources
  Assign a bunch more TextMate scopes
  CI step for samples
  Add .command as a Shell file extension
  CI config
  Vendored gems
  Update cibuild
  ...

Conflicts:
	Rakefile
Merge pull request #1608 from github/just-yajl

Use yajl since it is already a dependency
Merge pull request #1639 from pchaigno/asc

Heuristic rule to detect AsciiDoc files