Changed some things around
Merge branch 'master' of https://github.com/gramasaurous/pa2
Stuff