Added unicorn
Bundler
Fix some production compile
Remove unicorn