Merge pull #4 from tgstation/master

Let's do it right edition