Merge pull request #2 from FlaminSarge/master

Removed gamedata dependency, made a timer less bad
Update travis script to fix 1.7 compiler.
Should fix 1.7 compiler now.
Have some output
Hope this works.
Remove un-needed things
Hope this works now.
Remove SM1.7 compile warning