fix for file-allocation option and add new value

Before this changes file-allocation option always overrides server setting.
See https://github.com/tatsuhiro-t/aria2/issues/244

Also current version supports new type for file-allocation option.

Thanks for great work.