fixes for travis syntax check.. didn't know this SOB checks our syntax already ;-)
more syntax corrections for travis..
Merge branch 'feature/generator-ng' into develop