Merge pull request #81 from matthayes/master

Parallelize travis build
Add missing license headers

[ci skip]