Merge branch 'master' into comments
Moving the notifications to a partial

Clears up the funny issue where the notification would still display
outside of the div we created for it.
Merge branch 'comments'