Merge pull request #39 from SirAnthony/master

Windows fixes
Update .travis.yml
Merge pull request #28 from GLSL-Debugger/master

Merge upstream