Fixes merge conflicts.
Newer Travis.ci.
Testing.
Added.
Testing bower.
Bower stuff still.
This is stupid.
Merge pull request #147 from JonathanWarrick/cleanup2

Updates player disconnect logic to not freak out when a player leaves room.