Removed injection tags from main template file
Added extended version of ender
Extended config files
Enabled assembly by default
Merge branch 'wip'