Remove timestamps from affilations
Merge pull request #62 from seattlerb/fix-rails-3.2-timestamp-issue

Remove timestamps from affilations
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' into emailnotifications

Conflicts:
	db/schema.rb