Notifications

This is the notifications story, https://www.pivotaltracker.com/story/show/43833047

It probably needs merging/rebasing/something otherwise there'll be conflicts with dev.  Can someone give me a hand with that?  I tried but broke something.