Add support for marker, remove swiftclient requests, enable swift3 support