Move rvm section into matrix/include

* This is a test to see if we can remove the rvm section from travis
  config and just keep everything under matrix/include for
  consistency.
Bump parser dependency ~> 2.0.0.pre5
Bump unparser dependency to ~> 0.0.14
Bump concord dependency to ~> 0.1.3
Merge remote-tracking branch 'origin/master' into threaded
Look for the MalformedTreeError raised in my patched copy of unparser