Update README.md
Modify travis config.
Merge branch 'dev' of github.com:storm-enroute/macrogl into dev