Added travis build file - changed to properly build mod
Merge remote-tracking branch 'origin/master'

Conflicts:
	.travis.yml
Changed .travis.yml to properly build mod