Sync dev changes.
Remove not needed zamboni::settings::base