Merge pull request #40 from ZomgPonies/master

Merge From Master
Merge pull request #41 from ZomgPonies/master

Merge From Master
Merge pull request #42 from ZomgPonies/master

Merge From Master
Janitor Rework
Oops
Merge pull request #486 from Fox-McCloud/Janitorial-Stuffs

Janitorial stuffs