Simplify version checks...

...  Probably should have poked around first.
Merge pull request #14 from adam-vessey/7.x

Simplify version checks...