Merge branch 'release-v2.1.4' into develop
Fix api_key auth caching bug
Force cache_store to :null_store in test env
Update QA app to use new ApiAuth module
Fix twitter-bootstrap-rails's breaking change from 2.2.6 to 2.2.7
Improve canonical_sort to remove layered non-sort strings
Version 2.1.5
Merge branch 'release-v2.1.5'