Fix for overriding assets with combined versions in Rails 4.0 - fixes #137
Merge remote-tracking branch 'andyjeffries/master'