Merge branch 'master' of https://github.com/magfest/ubersystem into puppet_add_ini_settings
Merge remote-tracking branch 'origin/puppet_add_ini_settings' into puppet_add_ini_settings