Fix cmake build on windows.
Fix travis build.
Fix travis build.
Fix tabs
Merge pull request #927 from ricnewton/master

Fix cmake build on windows & travis build.