following pagodabox instructions
all old site minus fanatics
Some syntax fixes
syntax error should be fixed
small changes to database and added fanatics
removed vagrant related files
brought Vagrantfile up to date
hopefully fixed history conflicts
Merge remote-tracking branch 'upstream/master' into fanatics

Conflicts:
	deploy/database/data.button.sql
fixed some errors in the database
Introducing the Rage Brothers, and trying backslash hashtag for Game Dice
fixed trouble with trouble recipe
Merge pull request #368 from ManvilleFog/fanatics

Fanatics