Update to new ol3 taken from Tom Payne
Pull back to origin for ol3 again
Update ol3, update unit test

https://github.com/openlayers/ol3/commit/61ed9a106c1f746ef3834cd2a14b840f0c0f71a5