Fixed duplicate application.conf problem in SBT assembly - concat both files.
This fixes the assembly task which was broken when application.conf was split into 2 files.