Add forums
Remove diffs.txt
Merge branch 'master' into forums

Conflicts:
	db/schema.rb
Some cleanup of code to prepare for merging
Merge pull request #24 from austingulati/forums

Discussion Forums
Merge pull request #25 from grahamcracker/pr/24

Minor Mods of Forums Branch
basic topic permissions
start redesign
oops
added ton of db seeds from xls