more syntax corrections for travis..
Merge branch 'feature/generator-ng' into develop