Be more cautious when testing for OpenLayers
Merge pull request #215 from chrismayer/master

Be more cautious when testing for OpenLayers