add toolbar config to aloha-settings.js
Swap ui.js with alternative to avoid race condition.
Merge branch 'toolbar-fixes-20130814' into testing