I'm trying to pull upstream but it won't let me until I commit >:-(
Merge branch 'master' of https://github.com/buttonmen-dev/buttonmen
550 db fixes and 670 db additions
550 fixed changes to data.button.sql
had to delete so changes could be tracked together
550 db fixes and 670 db additions (3rd attemp)
fixed KublaCon - changed H to Y for Hoskins (bunny man)
fixed 50 State(s) plus MAJOR reordering of sets in db
back to square one
550 database changes only
* only allow five accounts to be created from a given IP address
Changed Zoe so merge can occur
Merge pull request #691 from cgolubi1/677_limit_ip

only allow five accounts to be created from a given IP address
reordered buttonsets and added new sets in button data
Merge pull request #693 from ManvilleFog/690_reorder_sets

690 reorder sets
* add IPs for dev and www to puppet
Merge pull request #697 from cgolubi1/628_open_alpha

add IPs for dev and www to puppet
* backup buttonmen database nightly
Merge pull request #699 from cgolubi1/628_open_alpha

backup buttonmen database nightly