Pt fix 80165018

This branch is going to take some more work before it is master-ready:

1. The latest few commits cause 'rake spec' to enter a recursive loop and
stack-out.
2. A lot of the later commits need to be squashed in to one commit (which
will end up being the commit that caused the above error)
3. The Events endpoint needs to be reverted / the views need to be cleaned
up if we're not making changes to the activity stream in this branch

I'm looking in to all of these right now and will continue to make changes
in the morning.

On Tue, Dec 16, 2014 at 6:50 PM, prakash-alpine <notifications@github.com>
wrote:
>
> In app/models/job_subscription.rb
> <https://github.com/Chorus/chorus/pull/33#discussion-diff-21949694>:
>
> > @@ -1,6 +1,6 @@
> >  class JobSubscription < ActiveRecord::Base
> >    attr_accessible :user, :condition
> >
> > -  belongs_to :user
> > +  belongs_to :user, :
>
> Michael This typo was fixed and checked. Please see the latest commit
> Prakash
> … <#14a562767e4b368e_>
> On Tuesday, December 16, 2014, mthyen <notifications@github.com> wrote:
> In app/models/job_subscription.rb <
> https://github.com/Chorus/chorus/pull/33#discussion-diff-21936330>: > @@
> -1,6 +1,6 @@ > class JobSubscription < ActiveRecord::Base > attr_accessible
> :user, :condition > > - belongs_to :user > + belongs_to :user, : Is this an
> issue? ", :" looks like a typo or an edit that was not completely reverted.
> — Reply to this email directly or view it on GitHub <
> https://github.com/Chorus/chorus/pull/33/files#r21936330>.
>
> —
> Reply to this email directly or view it on GitHub
> <https://github.com/Chorus/chorus/pull/33/files#r21949694>.
>