Test stuff on JRuby because we're fancy.
Travis config file.
Conflict resolution.