Merge pull request #2366 from reaperhulk/new-travis

add some el capitan to our travis build matrix