Merge pull request #244 from tomkralidis/master

update deps, fix CSW tests as owslib.csw now returns orderddict of results