Added TravisCI config to master branch.
Removed .orig file.
Fixed test problems on Windows.
Merge branch 'hotfix-1.0.1' into develop