copy all uber stuff into uber85
older installs (right now only magfest 8.5) will use this directory
newer installs (magfest 13 and beyond) will use the uber dir, which will support sideboard and other new config options
Prep for new ubersystem 2.0

Separated out uber vs uber85 (ubersystem used for magfest 8.5)

Hiera uses deep merging to actually combine the hierarchies

All data for magfest-specific ubersystem settings are now here including
the hiera files EXCEPT FOR secret data (i.e. stripe, AWS, and postgres
db/pass/user)

Next step: Get the new uber2.0 stuff for magfest 13 in here.
fixed 8.5 deploy
add schedule visibility option
update deploy scripts in magbot to have onsite 'burn' server
add burn hiera file
updated uber85 instance to allow overriding the SSL key
Vicki: added django debug option, default is false so it doesn't eat up memory
add custom_badges_really_ordered option to puppet
initial shot at DB replication, definitely WIP
postgres database replication in puppet.HOLY CRAP. 1st pass but it works. Dom wrote this on-site in a hurry before Magfest 8.5 and it probably needs some major refactoring, but for now it's solid
fix more replication stuff 11th hour
Merge branch 'master' of ../uber85 into uber85

Conflicts:
	manifests/daemon.pp
	manifests/db.pp
	manifests/globals.pp
	manifests/init.pp
	manifests/install.pp
	manifests/instance.pp
	manifests/python.pp
	manifests/user_group.pp
	templates/event.conf.erb
	templates/production.conf.erb
adding README to uber8.5 branch
first steps to merging 8.5 stuff back to mainline, replace all 'uber85' references with 'uber'
update readme to be mainline readme
fix incorrect error msg in postgres sync script for DB replication
Merge branch 'master' into merge85tomaster

Conflicts:
	manifests/instance.pp
	templates/event.conf.erb
	templates/production.conf.erb

this is just about ready to be merged back into 'master' branch
Fixup post-merge stuff (could've sworn I committed these two already)

Fixes issue with init_db dependency chain being weird.

Add event_name and organization_name back in
Merge pull request #4 from magfest/master

merge latest master into 85merge
working pass on vagrant support for uber deploys
- TODO: index.html files written out in the wrong order, must fix. minor thing.
- generated index.html lists any deployed ubersystem instances on that box
 - symlink fix ported over to workaround Vagrant+python virtualenv bug
 - move fake SSL certs into uber module
Merge branch 'merge85tomaster' of https://github.com/magfest/ubersystem-puppet into merge85tomaster