updated bootstrap data, schema, etc
commented out loader spec (for now)
Merge remote-tracking branch 'wagn/wikirate'
Merge remote-tracking branch 'upstream/wikirate' into develop

Conflicts:
	db/bootstrap/card_revisions.yml
	test/fixtures/card_revisions.yml
added indices for actions, changes and acts
cleaned up notification code
eof
replaced "watcher" with "follower"
yabu - fixed type for system emails
(cache problem in migrations)
added view logger
wagn 1.14
Merge remote-tracking branch 'ethan/wikirate' into develop

Conflicts:
	lib/card/query/card_spec.rb
changed db indices
fixed file bug
Merge pull request #2 from ethn/wikirate

simplified content setting
Merge pull request #221 from xithan/wikirate

update wikirate to current develop
isolated migration changes for wikirate update
Merge remote-tracking branch 'upstream/wikirate' into wikirate
added follow specs
turned off html diff