Update build settings for 2.1-RC2 (although strangely the deprec-
ation warning is still showing. Also add some app packages to the
template import settings.
Major template/i18n cleanup