Merge pull request #503 from fluent/at-prefix-for-type-and-id-parameters

Accept '@type' and '@id' in v1 configuration. fixes #500
Conflicts:
	lib/fluent/agent.rb
	lib/fluent/config/v1_parser.rb
	lib/fluent/root_agent.rb