Add Ruby 1.8.7 to travis-ci to test building with 1.8.7
Merge branch 'trail'