Revert "developmentdylan into master"

Reverts teamcoolguys/gpw2#27