Only merge in locals if they are explictly added

Related to [#254], in Rails 4, if :locals is nil, it will still have
keys() called on it