adding new plugins | removing annoying configs
merging with remote master