fixed travis
updated submodules
updated glfw
Merge pull request #24 from csherratt/fix-travis

Fix travis