be more multiplatform friendly
up version to 3.1 (MSpec support, cleanup support)
fixes JeremySkinner/Phantom#26
Merge branch 'master' of https://github.com/kenegozi/Phantom