init
re-added all bundle/ plugins
added extra plugins
resolved merge