Conflicts:
	hpcloud.classes.inc

File Entity will not format images if it detects that they are
not from a local stream. This is an odd constraint -- a heavy-handed
way of solving (presumably) some issue with a particular remote
stream wrapper.

To work around, we replace that particular check in cases where
the public:// or private:// stream wrappers are mapped to HP
Cloud. This still means that hpcloud:// assets need alternate
image formatters if used on their own, but this appears to be
a necessary evil until File Entity implements a better solution
to the unpredictibility of stream wrapper implementations.

Fixed an issue where css urls with get params were improperly encoded. This showed up when sass was appending a query string to control caching.

Assets stored in CDN-enabled containers will automatically
be served out of CDN (!!!!)

If account number is specified, secret is required.