Merge pull request #33 from ZomgPonies/master

Merge From Master
Revert "Merge From Master"
Merge pull request #34 from Fox-McCloud/revert-33-master

Revert "Merge From Master"
Merge pull request #35 from ZomgPonies/master

Merge from Master
Merge pull request #476 from Fox-McCloud/master

Merge Conflict Resolution?