Working on making the Search plugin an optional requirement, some CS fixes as well
Merge branch 'develop' of github.com:CakeDC/i18n into develop