Merge branch 'master' into hosting

Conflicts:
	Gemfile.lock
cache-hosting -- Rails.cache.fetch liquid tag for locomotivecms/engine
cache -- include activesupport gem; basic tag with spec

cache -- get key from options hash

cache -- swap order of options/tokens per send_mail example

cache -- accept array of key parts to join with separator

cache -- renamed to Cacher; creating composite key from given string

cache -- remove single quote from user submitted key

cache -- error => undefined method `context' for #<Liquid::Document

cache-hosting -- remove dependency on locomotivecms-solid gem

cache-hosting -- trying to make same as original hosting branch

cache-hosting -- Gemfile.lock (trying to get like hosting branch)

cache -- remove error_mode = :strict per tag/for example

cache -- remove whitespace around key

cache -- use Rails.cache in production

cache -- check for dalli gem to use Rails.cache

cache -- check for rails gem to use Rails.cache

cache -- remove both single and double quotes

cache -- inherit Solid::Block -- use variables in cache key

cache -- removed unused argument parsing method

cache -- don't add blank user parts

cache -- renamed variable cache_mechanism

cache -- remove wrapping slashes

cache -- change key root namespace prefix to 'locomotive'

cache -- remove logging unless in development

cache -- convert specs from .should to expect().to syntax

cache -- set Gemfile back to original so no spurious merge items

cache-hosting -- remove spurious commit from .gemspec