More work on things.
Merge branch 'Bleeding-Edge' of github.com:d3athrow/vgstation13 into Bleeding-Edge
Merge remote-tracking branch 'upstream/Bleeding-Edge' into riW3nfAj