Commented out comments controller tests - awaiting user auth helpers
Comment out include Authentication line - awaiting user auth helpers
Comment out include Authentication line - awaiting user auth helpers
Comment out before_filer :authorize user - awaiting user auth helpers
Fix merge conflict with merge upstream master
Comment out stub_authorize_user call - awaiting user auth helpers
Schema.rb update after merge with upstream