Updated travis.yml with valid syntax
Added the gen-idea plugin to allow IntelliJ idea projects to be generated
Merge remote-tracking branch 'origin/master'