Merge pull request #175 from johnsonc/master

import changes
import changes
OpenLayers.js url change