Fixing .travis.yml file problems.
Merge branch 'master' of https://github.com/Embroidermodder/Embroidermodder
Merge remote-tracking branch 'upstream/master'