Merge pull request #27 from TGameCo/master

NOWWW WILL IT WORK?????
adjustments
don't know why i didn't do this a while ago.
fuck you too travis
what the fuck. why doesn't this shit show up locally.
let's try this again
map fixes
seriously git, fuck your children
Merge pull request #1 from UristMcStation/master

Update