Change name of EParserAdapter's file to e_parser_adapter.rb
Change array/hash concat/merge to only be available for --parser future.

This adds an assertion that + is only allowed when --parser future is
in effect. Tests uppdated.