Travis Matrix build
Merge pull request #1 from jbtule/master

Travis Matrix build