Merge pull request #404 from fommil/master

travis wants explicit scala versions