Clean up the .travis.yml a bit.
minor
Merge branch 'travis'
Merge branch 'master' of github.com:haxenme/NME