A little cleanup and organisation of our feature detection
Merge pull request #655 from lonelyplanet/matth/cleanup-feature-detect

A little cleanup and organisation of our feature detection