Revert "Merge pull request #280 from akofink/e734-analytics"

This reverts commit e78f07c31fbc7c66eaa387193b6104c2dde9aec5, reversing
changes made to 07ab31481cb2f1493d27b0be88bc35481b42d083.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	test/unit/assignment_test.rb
Merge pull request #283 from akofink/master

Revert Merge of E734